Code

Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)

Trivial merge