Merge remote-tracking branch 'github/pr/1124'
authorFlorian Forster <octo@collectd.org>
Tue, 14 Jul 2015 06:19:38 +0000 (08:19 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 14 Jul 2015 06:19:38 +0000 (08:19 +0200)
commite739c81228d4b68531f6a64974192b1e1b0adf47
tree4ea4b58a3934ab55142ce0cc39242c630e245b05
parentff17a1ce15e2bb1ea43c05974a17901ca43bc0d7
parentf1f9c09527c7ec6d89c2eafcae4a81af99056aca
Merge remote-tracking branch 'github/pr/1124'
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod