Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Apr 2007 07:05:19 +0000 (09:05 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Apr 2007 07:05:19 +0000 (09:05 +0200)
commit03d51a7c86c0f4e8047e62f1e72ce2208aad97cb
tree376b09c50a254d862924fd0463d6bfd55ac816ff
parent11f6f956e9299b4e167fb43e68a27cdb4ae1f376
parentf4c7c0019eee38dc9ca5dbb520e5c5d1b0e3ae8e
Merge branch 'pull/collectd-4' into collectd-4