Merge branch 'pr/846'
authorFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
commit7c702e464f9faf954c320ec5b87c4755083d82bd
treeeadbf3ac47fa760559dad902a13e9ec34a20f988
parentaa958d2ad30d29553e489bc727254a8eedb4ea17
parent6f2d0db7adbe2bc9c2bd513f896a72a5eda70073
Merge branch 'pr/846'
src/collectd.conf.in
src/collectd.conf.pod