From: Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Date: Mon, 6 Jul 2009 11:45:41 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~85
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=fa9fd186f4e09c24a02d9541c2409d21bf282087

Merge branch 'collectd-4.7'
---

fa9fd186f4e09c24a02d9541c2409d21bf282087