Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Sep 2009 10:24:20 +0000 (12:24 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Sep 2009 10:24:20 +0000 (12:24 +0200)
commit3ddd3791fefa478d770aba82303ec6a1913874fc
tree670c807cb613a9e9e87f62dff1cfeb9089113fa3
parent658c85755ef1f4284228d1e5edbc4452a31bd944
parent50aeefda1c2fab3be57d26e1ca221c1e3774e5c3
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh
ChangeLog
contrib/collection3/etc/collection.conf
src/powerdns.c