Code

Merge branch 'master' into sid collectd-5.6.1-2
authorMarc Fournier <marc@bl.uem.li>
Tue, 1 Nov 2016 07:00:05 +0000 (08:00 +0100)
committerMarc Fournier <marc@bl.uem.li>
Tue, 1 Nov 2016 07:00:05 +0000 (08:00 +0100)

Trivial merge