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

Merge branch 'collectd-4.6' into collectd-4.7
---

b3bfb951c73ea3d232e0e97a42479a5e3310125d