From: Florian Forster <octo@collectd.org>
Date: Fri, 20 Sep 2013 13:32:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: collectd-5.5.0~346
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d0bf11d455b9da5770382f3cd20667723f1bbdb5;p=collectd.git

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

d0bf11d455b9da5770382f3cd20667723f1bbdb5