Merge branch 'pr-713'
authorFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 09:21:50 +0000 (11:21 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 09:21:50 +0000 (11:21 +0200)
commit01f4a6eb87b83ccd2f77e0116e5bd09645c731d5
treeb7b9964e568820012300bcf11037c492de6a513e
parent53054595c815f30d3532a0eb14c155aad8d9d6b3
parent7256d7b15948568c4e5d13d830c89be082d4db29
Merge branch 'pr-713'
src/collectd.conf.in
src/collectd.conf.pod