Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)
commit6120d0461a933cdbb8a6e495c6b6e8750c8aaf05
treefdfd73683797e43c6286f2eb29ff3b37e7660134
parent517b79d297b496077bd1e0e14d02250998f2df33
parent03c308c99caa9e5d088487fcda27cc756ffd6b1c
Merge remote-tracking branch 'github/master'