From: Florian Forster <octo@collectd.org>
Date: Mon, 16 Dec 2013 16:17:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.5.0~332
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b19aa60c32f4792f8e16f90af22166c185540702;p=collectd.git

Merge remote-tracking branch 'github/master'
---

b19aa60c32f4792f8e16f90af22166c185540702