Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:30:59 +0000 (07:30 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:30:59 +0000 (07:30 +0200)
commit3fc7651f7fbfab0ab05e0ea3007e179d2ea67e11
tree13eae7547d2f3e65d327568a617e77579e25fee4
parent475135b49b9bf7ee2885b6d9c7083c2b596ce844
parent122c7281c00e43a7a094915afea13f30e7d84b1c
Merge branch 'collectd-5.6'