From: Florian Forster <octo@collectd.org>
Date: Sat, 13 Jul 2013 09:23:32 +0000 (+0200)
Subject: Merge branch 'collectd-5.2' into collectd-5.3
X-Git-Tag: collectd-5.3.1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a320c4a23fee0e900a7cd2310c771b8dbd2a2d82;hp=a320c4a23fee0e900a7cd2310c771b8dbd2a2d82;p=collectd.git

Merge branch 'collectd-5.2' into collectd-5.3
---