From: Florian Forster <octo@collectd.org>
Date: Tue, 14 Jan 2014 07:43:06 +0000 (+0100)
Subject: Merge branch 'master' into katzj/memory
X-Git-Tag: collectd-5.5.0~288^2~11
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bf67ab648e6d835dd53f81791cfb6b651a2ba814;p=collectd.git

Merge branch 'master' into katzj/memory
---

bf67ab648e6d835dd53f81791cfb6b651a2ba814