From: Florian Forster <octo@collectd.org>
Date: Wed, 3 Jul 2013 05:46:40 +0000 (+0200)
Subject: Merge branch 'vbartoni/df'
X-Git-Tag: collectd-5.4.0~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d56026568932858d8eb3ad6e8588086eac0dbf5e;p=collectd.git

Merge branch 'vbartoni/df'
---

d56026568932858d8eb3ad6e8588086eac0dbf5e