From: bbczeuz <githubmail@zeuz.ch>
Date: Mon, 25 May 2015 17:49:33 +0000 (+0200)
Subject: Merge pull request #1 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5d01cda97e703fe1795cf9364719aab2729b5ed2;p=collectd.git

Merge pull request #1 from collectd/master

Update from original
---

5d01cda97e703fe1795cf9364719aab2729b5ed2