Merge remote-tracking branch 'github/pr/1924'
authorFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:56:26 +0000 (07:56 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:56:26 +0000 (07:56 +0200)
commit9927325e311d2507b1cf7bcda4d1f0347ffb1585
tree86fe488128e4ce1735882685d68a186ffdb4dbc3
parentc599624c3fa1689639ac96526d9fdcb9953b07ab
parent6a151af7649eb811a5f8dc1bd78c21e6c53c74aa
Merge remote-tracking branch 'github/pr/1924'
src/collectd.conf.pod