Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 27 Feb 2008 21:50:22 +0000 (22:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 27 Feb 2008 21:50:22 +0000 (22:50 +0100)
commitd35dd47646956b011a75084a979fd7850cea9a6b
tree914fc885ed5ed71d335ef8e1efa772712e198ca0
parentb3a98261724de42a6a4dddc642be9fa23aa656d4
parent04fd7e422e9ca5ca75d5ffa253cf541d821baa1b
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd