Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 18 Feb 2008 17:30:10 +0000 (18:30 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 18 Feb 2008 17:30:10 +0000 (18:30 +0100)
commit7284486320eb036e9d4e60d2e68f4b05421ee785
tree827dc3b6e24b13c46af3362f8602b1f931e8deed
parent89318fa17ebfb8a4dc839dd4d8753b5531dd92df
parent5ffa49e50eeaf421361fb64ad7105f185251f59f
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd