Merge remote-tracking branch 'github/pr/1082'
authorFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 19:40:27 +0000 (21:40 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 19:40:27 +0000 (21:40 +0200)
1  2 
src/collectd.conf.pod
src/write_redis.c

Simple merge
Simple merge