Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Dec 2007 11:11:17 +0000 (12:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Dec 2007 11:11:17 +0000 (12:11 +0100)
commit79dab1613955126520ab36e772f0afb596fd51dc
tree68e3b9061fcb2aef1009b044dea7a7b34a56acc2
parentfbcda5ac431bbb293157bf00e204310dcb65afd3
parent4a5e97d6e317ee050b0a942e50159473a7d144dc
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd