Merge branch 'pr/2004'
authorFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 11:44:05 +0000 (13:44 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 11:44:05 +0000 (13:44 +0200)
commitd57d39331d6e4397763a480b1388b2c4a931a6da
tree43432dde47ff8c3d4b8edf91ebdd76f48e1fd76b
parent5aa9bb0e92c0540eb83f71bc9ed555d4363624c6
parent301e912b2b1bd19f17e9addb26b009f6f67d7f88
Merge branch 'pr/2004'