From: Florian Forster Date: Thu, 30 May 2013 06:10:42 +0000 (+0200) Subject: Merge branch 'collectd-4.10' into collectd-5.2 X-Git-Tag: collectd-5.3.1~4^2~1 X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=a05485da75ec42a9aa38354e0d0364885b1ecad9 Merge branch 'collectd-4.10' into collectd-5.2 --- a05485da75ec42a9aa38354e0d0364885b1ecad9