From: Claudius Zingerli Date: Thu, 21 Jan 2016 16:46:50 +0000 (+0100) Subject: Merge branch 'master' of git.edu-zg.ch:zeuz/collectd X-Git-Tag: collectd-5.6.0~258^2~17^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90b186315b766c10bacd2f5171b3d05f65280da5;p=collectd.git Merge branch 'master' of git.edu-zg.ch:zeuz/collectd --- 90b186315b766c10bacd2f5171b3d05f65280da5