Merge branch 'pr/1395'
authorFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
commite96afedbc67f8a508e37b73217c224aa5bd25f66
treeeea64c0e2d59cf808a243db6e7d39561d0b860bc
parent7c702e464f9faf954c320ec5b87c4755083d82bd
parente74073f4f68afea071fddfdb6b0ea180f8c86559
Merge branch 'pr/1395'
src/collectd.conf.pod