Code

Merge tag 'upstream/5.5.0' collectd-5.5.0-1
authorSebastian Harl <sh@tokkee.org>
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200)
Upstream version 5.5.0


Trivial merge