Merge remote-tracking branch 'github/pr/1396'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)
commitda62514318db2acc388403c92dc3cbfabec919bb
treed589bec60a520cf6f50a0296cce88a240002000a
parent34773d9145c11f44840e10cc3bb0551de8d273e6
parent155f43f78f59d3740baa47e451c427f7b274eb76
Merge remote-tracking branch 'github/pr/1396'