From: Florian Forster <octo@noris.net>
Date: Wed, 29 Sep 2010 15:06:00 +0000 (+0200)
Subject: Merge branch 'kr/ctxt'
X-Git-Tag: collectd-5.0.0-beta0~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58217009d8028d2e5d654c8b76562f59e28c9c30;p=collectd.git

Merge branch 'kr/ctxt'
---

58217009d8028d2e5d654c8b76562f59e28c9c30