Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200)
commit53bd9256920f01cc5b835639c7e7971979ed3350
tree77889b59d4f939e914a67b677600491854d74beb
parent4d36d5826a3853ccd62195daf3b831d942850f1a
parentf16fb0982b5f5781ab723f83eacc5df9509b6ef6
Merge branch 'collectd-4.2' into collectd-4.3