Code

Merge branch 'pr/1394'
authorFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)
commit8a0163fec85502d1641757f2e3f536d498c7f2b8
tree159beb251d11889404f384cb1da9bd79bc85d610
parentce2fb80a17bf452d8b5bf4660453ffee510e0868
parent96c33de27441f6487ed252e22f7c1129d5bf05fc
Merge branch 'pr/1394'