Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 15:03:04 +0000 (16:03 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 15:03:04 +0000 (16:03 +0100)
commitb3f9a3808f0919dabaa17707c7c4f5ed75df99cc
tree6da87fb11b90d5ffe0a51d841a7e12f61008fe95
parente1dfb87264e7c3f421c237804aea2952213dc2a8
parent7d77b84dbba2bb7230ae76a26335d89b2dc7604a
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd