Code

Merge remote-tracking branch 'github/pr/1961' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2016 06:44:53 +0000 (08:44 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2016 06:44:53 +0000 (08:44 +0200)
commitf8232cfe5e140b6c89dbe736480ae547a0e04374
treed304e1346001284a7516e37c5d48fefc97b806dd
parentf90895e424aee58b19cd497a650a4592658f60ad
parenta2e870fa005e4612ed126a49fbebd8618e50da6f
Merge remote-tracking branch 'github/pr/1961' into collectd-5.5