From: Florian Forster <octo@collectd.org>
Date: Mon, 8 Sep 2014 09:21:50 +0000 (+0200)
Subject: Merge branch 'pr-713'
X-Git-Tag: collectd-5.5.0~206
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=01f4a6eb87b83ccd2f77e0116e5bd09645c731d5;p=collectd.git

Merge branch 'pr-713'
---

01f4a6eb87b83ccd2f77e0116e5bd09645c731d5