Merge remote branch 'jeromer/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
commit7b814553432aec88ec454db4f3b4655b9657d4d2
tree4d8db6b96070d417eeab14820098342cf1d1893b
parentad28576277460fcd189380c4f965879f106b5311
parent835a08771b95afec14114db407b86da33aa19558
Merge remote branch 'jeromer/master'
src/collectd.conf.pod