From: Florian Forster <octo@collectd.org>
Date: Wed, 7 Aug 2013 06:39:08 +0000 (+0200)
Subject: Merge branch 'pr/381'
X-Git-Tag: collectd-5.4.0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f47430fa93cc9fd374dbb998a4b68c3e3f454c95;p=collectd.git

Merge branch 'pr/381'
---

f47430fa93cc9fd374dbb998a4b68c3e3f454c95