Code

Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 10:54:48 +0000 (11:54 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 10:54:48 +0000 (11:54 +0100)
commit11d4faafeeb9e327ee58cfa00acd6079debaca40
tree4aaf9727dec4e2ca4ae4c2170868f9425399ec54
parent9088325b0705fd9cf62a4b68b0253d20bb37840b
parent439034ae2ec4fa28e6f2d0b5c1f0f18c80762e90
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd