From: Florian Forster <octo@collectd.org>
Date: Sat, 16 Mar 2013 15:31:50 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: collectd-5.3.0~30
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1a02ec9a549ff7145db028f9ff2b3d9b2e9a6ef6

Merge remote branch 'origin/master'
---

1a02ec9a549ff7145db028f9ff2b3d9b2e9a6ef6