From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 11:41:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: collectd-5.2.0~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e072b3e9cc0188bf85912c95bb97d9b0de443915;p=collectd.git

Merge remote-tracking branch 'origin/master'
---

e072b3e9cc0188bf85912c95bb97d9b0de443915