Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Aug 2008 18:47:39 +0000 (20:47 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Aug 2008 18:47:39 +0000 (20:47 +0200)
commit150924b271e21387ad1929e2373cc6e0772dc351
tree207ba9cd9be3a57f9b7c32a3fe4930541e536b63
parent246b04fdac89edc0b605bcd18ddee3382595254e
parent75f7d32a95861e0dcd7fcdee151b3693ab7211d2
Merge branch 'master' of /var/lib/git/collectd