Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:20:27 +0000 (10:20 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:20:27 +0000 (10:20 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge