Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200)
commit3f0d178e58251171272a643e1667abcb9946edce
tree5e7bda21413501c8b833c20ad0f2d0bea6be0c27
parent293f51479144f9a7b34dbb835da1143ae850b159
parent452a77a524df028532f4d096c29b7e2a4f5102b7
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
ChangeLog
src/collectd.conf.in
src/collectd.conf.pod
src/configfile.c