Code

Merge branch 'collectd-4.4'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 08:49:13 +0000 (10:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 08:49:13 +0000 (10:49 +0200)
commit8a277e54b4ed7bccb4b3a2e7668792cd5303d3ac
treea1714af42b637c1d7ceafeef9eb9cdd8eb9b5847
parent603bd7010a138853ede98be4809b914f104bdd63
parentd164514834928b3cc5feacb2698b4329fa986b8d
Merge branch 'collectd-4.4'

Conflicts:

ChangeLog
ChangeLog