Code

Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)
commit1b321a7ab0181dc8cd9cca5ffbed74eb69f634d3
tree435e47b4b3940ee6c33c894ae1cbb61d8e7d1230
parent4383a97f4f66c1abb514d2cc7eaa9104518da88e
parent35518a6531412378c29fc07718b81b22bae9e6dc
Merge branch 'master' of git://git.verplant.org/collectd