From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 22 Jul 2006 20:34:27 +0000 (+0200)
Subject: Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd... 
X-Git-Tag: collectd-3.10.2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=179d9b650db685f5f04f36a3019e4ffea377d960;p=collectd.git

Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10
---

179d9b650db685f5f04f36a3019e4ffea377d960