Code

Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:51 +0000 (12:26 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:51 +0000 (12:26 +0100)
1  2 
configure.in
src/Makefile.am
src/collectd.conf.in

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge