From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 19 Jul 2013 18:48:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/371'
X-Git-Tag: collectd-5.4.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b022ebf40a1a49bedf5992e6542c1c0b6a62c13;p=thirdparty%2Fcollectd.git

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

9b022ebf40a1a49bedf5992e6542c1c0b6a62c13