From: Florian Forster <octo@collectd.org>
Date: Fri, 16 Aug 2013 09:27:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.4.0~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c7b21ea4befed851564f38140cfcd06a806e1050;p=collectd.git

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

c7b21ea4befed851564f38140cfcd06a806e1050