Merge remote-tracking branch 'github/pr/1336' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 20:33:41 +0000 (21:33 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 20:33:41 +0000 (21:33 +0100)
commit4c30f47794046ec7c8dfb5e1d41d03633032bac7
treeca0ef8881665b299cdc3f34c4485b92c50a7490a
parent01e77b97fa9fe4979815fe0c8a533c9dc97aa1d1
parent08bd4dd86e0fcb6828819cdf6bb3ae2115b1b8f4
Merge remote-tracking branch 'github/pr/1336' into collectd-5.5