From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 26 Nov 2010 21:50:45 +0000 (+0100)
Subject: Merge branch 'master' into ja/lua
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4227efa91b3c2ed7f2e8f8e9b19ab414f7a35e6d

Merge branch 'master' into ja/lua
---

4227efa91b3c2ed7f2e8f8e9b19ab414f7a35e6d