From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 11:41:34 +0000 (+0100)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=05fb05dcf56a4676956c38d7a33ae5e6967ac331;p=collectd.git

Merge branch 'collectd-5.1'
---

05fb05dcf56a4676956c38d7a33ae5e6967ac331