Merge remote-tracking branch 'github/pr/1370'
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)
commit5e0906a2afdd7a41fb9635190dc4427993c34e5c
treed69a46aa409f13a35bbbe28e44e85b4a01a26a88
parent5e4dde6e6e5b99dbd8a52184d85414bb17d1f695
parenteff52149778a4ae3cbd5c0088633b9cef9ade7d9
Merge remote-tracking branch 'github/pr/1370'