From: Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Date: Wed, 11 Jun 2008 12:30:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~10
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=7746d34c8ecc4fa984187cf2b1a93d1b6d3a061b

Merge branch 'collectd-4.3' into collectd-4.4
---

7746d34c8ecc4fa984187cf2b1a93d1b6d3a061b