Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 19:58:31 +0000 (21:58 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 19:58:31 +0000 (21:58 +0200)
1  2 
configure.in
src/Makefile.am

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