Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:15:36 +0000 (18:15 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:15:36 +0000 (18:15 +0100)
commit59c7ee1cafaf53814838794908dd84f8101334c7
tree668755ddab19eb6e47bf750836566840b50088fa
parentbc5ed652b1fe5cf210feec21226ede3e21882b45
parent1bb1667d220d07f25c584a41be7f3dfcbc1ad04b
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/df.c

Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953
contrib/exec-nagios.px
src/bind.c
src/df.c