Code

Merge branch 'collectd-4.10' into collectd-5.0 collectd-5.0.4
authorFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:07:09 +0000 (12:07 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:07:09 +0000 (12:07 +0200)
commitf1ba2733d2c58fed90c13e9ae31cb7c1f3c5613e
treee132f22511e4c9b5c74b272b13eeefa8845f20e4
parent5cf091d2e55d6904c2989f6d36e97cf12342b139
parent005b30336048fac4a7af48125861d736990c1454
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
ChangeLog