From: bbczeuz <githubmail@zeuz.ch>
Date: Fri, 18 Dec 2015 10:28:14 +0000 (+0100)
Subject: Merge pull request #5 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b1b0aa549005c62b0e4651053198693e33ea84f0;p=collectd.git

Merge pull request #5 from collectd/master

merging upstream
---

b1b0aa549005c62b0e4651053198693e33ea84f0