Code

Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)
1  2 
README
configure.in

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