Merge branch 'mg/jitter'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 18 Aug 2009 19:39:03 +0000 (21:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 18 Aug 2009 19:39:03 +0000 (21:39 +0200)
commitc35203c82560eba66bb901aa22c5170fb8c389fb
treee4244d9c004297b2fb311f04c5eb3eae4a35610e
parent4151d975ca93af4570a1ca97a0408ba446ea7485
parent2bca2a511c1636bf448112d081d115ebc01b5ed4
Merge branch 'mg/jitter'
src/collectd.conf.pod