Code

Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:19 +0000 (17:43 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:19 +0000 (17:43 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge