Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 07:40:28 +0000 (09:40 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 07:40:28 +0000 (09:40 +0200)
1  2 
README
configure.in

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