From: Florian Forster <octo@collectd.org>
Date: Tue, 14 Jan 2014 07:40:53 +0000 (+0100)
Subject: Merge branch 'katzj/swap'
X-Git-Tag: collectd-5.5.0~316^2~9
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3c7af521c4551c78e9139b9ac8b2d56f693fb2f8;p=collectd.git

Merge branch 'katzj/swap'
---

3c7af521c4551c78e9139b9ac8b2d56f693fb2f8