Code

Merge branch 'master' into sid collectd-5.5.2-2
authorMarc Fournier <marc@bl.uem.li>
Wed, 21 Sep 2016 12:34:36 +0000 (14:34 +0200)
committerMarc Fournier <marc@bl.uem.li>
Wed, 21 Sep 2016 12:34:36 +0000 (14:34 +0200)

Trivial merge