From: Florian Forster <octo@collectd.org>
Date: Tue, 23 Sep 2014 14:13:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'github/pr/697'
X-Git-Tag: collectd-5.5.0~176
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2a8ee0dbb694eac183fff0306ea9c41c46facad7

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

2a8ee0dbb694eac183fff0306ea9c41c46facad7