From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 21 Aug 2015 12:14:10 +0000 (+0200)
Subject: Merge tag 'upstream/5.5.0'
X-Git-Tag: collectd-5.5.0-1^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e9a8d617a8b29c6bc8700885e2cd15d8b71e8f1;p=pkg-collectd.git

Merge tag 'upstream/5.5.0'

Upstream version 5.5.0
---

9e9a8d617a8b29c6bc8700885e2cd15d8b71e8f1