Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Mon, 12 Nov 2012 07:28:16 +0000 (08:28 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 12 Nov 2012 07:28:16 +0000 (08:28 +0100)
1  2 
configure.in
src/Makefile.am

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