Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100)
commit8ea1756522f94af8e0bb7d06c800d94874f13549
treea9c75fad957d427cd8f034980b5010a20921a4da
parentfc0c95b33d7ddbd02071c5835b25d777812335c6
parent97a56612a875c1f1003b13398c0b757c308a7ed5
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2