From: Florian Forster Date: Thu, 11 Oct 2012 20:03:51 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1 X-Git-Tag: collectd-5.1.1~4 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a5dac903c9dcc94ba911a91c754541e4534bb58c;p=collectd.git Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1 --- a5dac903c9dcc94ba911a91c754541e4534bb58c