]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)

Trivial merge