Merge branch 'pr/1826'
authorFlorian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
commitda612fa9c6a3343b43789569d64197d7c690be52
tree48f530eb1092658e749ddf8702e921259c7e9c46
parent83d2ff540ffaa5ca8cf3f37ea428d4b4b8c8d875
parent2a28b85efff687d0753d816fcf89f6be01605db5
Merge branch 'pr/1826'
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod