Merge remote-tracking branch 'amarx/collectd4' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)

Trivial merge