From: Florian Forster <octo@collectd.org>
Date: Tue, 23 Sep 2014 14:09:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'github/pr/734'
X-Git-Tag: collectd-5.5.0~177
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e363577f4d0a94bef1929f9d9829fb94765ec1e;p=collectd.git

Merge remote-tracking branch 'github/pr/734'
---

0e363577f4d0a94bef1929f9d9829fb94765ec1e