Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100)
commitac077f078300f47d5a6b75aaeeb0999799309283
tree556cd4eba89ae7ce2489558ee22c2fbc2ac16a43
parentadb8986db8afd4cea48e176619def459a5c292e7
parentfc6f1e3d33d646391adb5cedc62e7b3904c15003
Merge branch 'collectd-5.5'
src/apache.c
src/daemon/common.c
src/statsd.c