From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 7 Feb 2011 07:42:05 +0000 (+0100)
Subject: Merge branch 'ff/swap'
X-Git-Tag: collectd-5.1.0~78
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7e16c9347076ef731476d4864add43f0049135c4;p=collectd.git

Merge branch 'ff/swap'
---

7e16c9347076ef731476d4864add43f0049135c4