From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 08:49:45 +0000 (+0200)
Subject: Merge branch 'ka/pinba'
X-Git-Tag: collectd-4.10.0~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b34e15480992d9433a0e3fda47b5f6d387bfda5e;p=collectd.git

Merge branch 'ka/pinba'
---

b34e15480992d9433a0e3fda47b5f6d387bfda5e