Code

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)
1  2 
ChangeLog
src/collectd.conf.in
src/collectd.conf.pod

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge