From: Florian Forster Date: Sat, 20 Oct 2012 06:57:02 +0000 (+0200) Subject: Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10 X-Git-Tag: collectd-5.0.5~1^2~11 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e1cbbf3d7bce76be363f28f83ac87c59156ef2a2;p=collectd.git Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10 --- e1cbbf3d7bce76be363f28f83ac87c59156ef2a2