Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
Conflicts:
configure.in

1  2 
configure.in

diff --cc configure.in
Simple merge