Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 15:42:56 +0000 (17:42 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 15:42:56 +0000 (17:42 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge