From: Claudius Zingerli Date: Fri, 12 Feb 2016 10:48:19 +0000 (+0100) Subject: Merge branch 'master' of github.com:bbczeuz/collectd X-Git-Tag: collectd-5.6.0~258^2~17 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9c005ac200587f2df285aaae1c3d4071e7db29d8;hp=-c;p=collectd.git Merge branch 'master' of github.com:bbczeuz/collectd --- 9c005ac200587f2df285aaae1c3d4071e7db29d8