From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 8 Apr 2009 14:47:49 +0000 (+0200)
Subject: Merge branch 'dm/misc'
X-Git-Tag: collectd-4.7.0~76
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=03930221c60cbe148d32a1350e6464038a5bb6bf;p=collectd.git

Merge branch 'dm/misc'
---

03930221c60cbe148d32a1350e6464038a5bb6bf