From: Florian Forster <octo@collectd.org>
Date: Sat, 1 Jun 2013 07:25:19 +0000 (+0200)
Subject: Merge branch 'vb/df'
X-Git-Tag: collectd-5.4.0~32
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7e2a10e78c6fd263d0360bf929158dc1b2257704;p=collectd.git

Merge branch 'vb/df'
---

7e2a10e78c6fd263d0360bf929158dc1b2257704