Code

Merge branch 'collectd-3.11' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 31 Aug 2007 14:08:37 +0000 (16:08 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 31 Aug 2007 14:08:37 +0000 (16:08 +0200)
commit2b6176cab4f092354177473bbc74c5cdc2eaa2ec
treea7fd4cdf88ccd569d972ddf58afd059851061e8b
parentead5567107bc6a39a0e96b2756bc0711d67a538b
parent258c92657e3e1eadf2388d697554270eb6fc3f9f
Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

ChangeLog
configure.in
ChangeLog
src/collectd.conf.pod