Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd
authorFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)
commit708efd7f4459d17d2f774c8b4e94b1cf62b12e0f
tree09b8a7887892d10cc3cd8e8685ccfb8c5307ea04
parent365d0cc032c8a5df45492cdfc1090984951e78db
parentf9242f6725573d713fa5e7e2e1f2164fea77a107
Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd