Merge branch 'pr/1469'
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100)
commit05ec6a8938ab154b3572cb7bfe7204b00c989575
tree8c53064ae0e8199b3df31083e466463f76cb9a15
parent0532336600cf2abe1d25af8fbf5ad3cf3b6b31e0
parentacc08dba3f5ce862fce444dec14510d959a117d6
Merge branch 'pr/1469'