Merge remote-tracking branch 'github/pr/706'
authorFlorian Forster <octo@collectd.org>
Fri, 22 Aug 2014 05:23:28 +0000 (07:23 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 22 Aug 2014 05:23:28 +0000 (07:23 +0200)
commitbca0f0af973fcd4b34e3cf6072e193ac9dbc65fc
treefb31c9d4d38235ad3c1aa9dd9882aad08e15e758
parent39771ec2af4559a62bda2c469a2501c6023f551e
parentb87c57591e40b3d9cd86c0a382818acc78558d96
Merge remote-tracking branch 'github/pr/706'

Conflicts:
src/write_riemann.c
src/collectd.conf.in
src/collectd.conf.pod
src/write_riemann.c