From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 23 Jan 2014 22:22:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/524'
X-Git-Tag: collectd-5.5.0~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2106c1e8c35c24e274f5ec08b70e967ade27ba4;p=thirdparty%2Fcollectd.git

Merge remote-tracking branch 'origin/pr/524'
---

f2106c1e8c35c24e274f5ec08b70e967ade27ba4