Code

Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)
commit87e53c90047eb1ff8818105762ff997a5cfea4ad
treeaf650c9f68c25de7050ae854a8b6c4b339d001b5
parentfacbb03bdd0c591344b1a81dd0437064cfcc24e5
parentb5b01583cab80db95e8fd9c38d27db9f12f1f96c
Merge branch 'collectd-5.6'