Merge remote-tracking branch 'github/pr/1054'
authorFlorian Forster <octo@collectd.org>
Thu, 28 May 2015 12:09:35 +0000 (14:09 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 28 May 2015 12:09:35 +0000 (14:09 +0200)
commit711a4a302936537f6487a99d0ed8f292a8135817
treef8d206a34997283dad4876bec189f36c168181d0
parentffc3836c22daa43aec1e28dc97c92f8e60b1b5ee
parent0e8adc990989f23bff5fe62e9e0b1e12a494935a
Merge remote-tracking branch 'github/pr/1054'
configure.ac
src/Makefile.am
src/collectd.conf.in