From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 11 Jul 2009 12:59:21 +0000 (+0200)
Subject: Merge branch 'ps/tokyotyrant'
X-Git-Tag: collectd-4.8.0~76
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa

Merge branch 'ps/tokyotyrant'
---

6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa