Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:56:25 +0000 (13:56 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:56:25 +0000 (13:56 +0100)
1  2 
AUTHORS
configure.in

diff --cc AUTHORS
Simple merge
diff --cc configure.in
Simple merge