summaryrefslogtreecommitdiffstats
path: root/CODING
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2012-06-24 23:14:12 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2012-06-24 23:14:12 (GMT)
commitbf7c4f95aea64e784c66c7ee27da5259ce07f4e1 (patch)
tree01085159faf8adc60bb9b87ae9ad7f80918ef8b7 /CODING
parent991054fa6e3d8b3288679ebfe6d84bcfe3ca5d20 (diff)
parentc69890a4b4e3b303ae82cc7eec773486e08c80bb (diff)
downloadmonitoring-plugins-bf7c4f95aea64e784c66c7ee27da5259ce07f4e1.tar.gz
Merge remote-tracking branch 'github/waja/master'
Conflicts: NEWS
Diffstat (limited to 'CODING')
0 files changed, 0 insertions, 0 deletions