From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 22 May 2009 15:42:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91c6c281709cea60e7f79af07066ce6e69f685ee;p=collectd.git

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

91c6c281709cea60e7f79af07066ce6e69f685ee