Code

Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Fri, 29 Mar 2013 20:30:21 +0000 (13:30 -0700)
committerFlorian Forster <octo@collectd.org>
Fri, 29 Mar 2013 20:30:21 +0000 (13:30 -0700)
1  2 
configure.in

diff --cc configure.in
Simple merge