Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 17:26:17 +0000 (18:26 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 17:26:17 +0000 (18:26 +0100)
commit3dffa6fb50c66249fb3da7592c7a9385edb74677
treec2a303c230563fe5c3edfa2c136df2f8a5c4ab06
parente770968a686963a3c8373cd6cd38b13964433029
parent26fbc23e518dcc74502ae3b2495112adc3840879
Merge branch 'collectd-5.0'
ChangeLog
src/collectd.conf.in
src/collectd.conf.pod