Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Feb 2009 21:54:40 +0000 (22:54 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Feb 2009 21:54:40 +0000 (22:54 +0100)
commit56159e13f4b983a2e8c846b39ca96b2384ec746a
tree74c9bc5e7a69deeaf4988a27850c5d4596aa7f7e
parentd54dfab9b049de396e6a38d690d5f18917e093ea
parent85595909d57159907df4789320b857e5a2b946cf
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd