Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:01:19 +0000 (10:01 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:01:19 +0000 (10:01 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge