Merge remote-tracking branch 'github/pr/1930'
authorFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 19:42:07 +0000 (21:42 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 19:42:07 +0000 (21:42 +0200)
commitc4d79642e546f4992d5d4b3d62ae74490d21ee87
tree7dc60293784a7b39bcb81f198cb799dc1a764a07
parent0a95b83f89a553be1ac2beae2003927e74230d23
parent0030d4216cda0062baf7f9047bb524eebfaaf1ad
Merge remote-tracking branch 'github/pr/1930'