From: Florian Forster Date: Sun, 18 Aug 2013 07:04:45 +0000 (+0200) Subject: Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json X-Git-Tag: collectd-5.4.0~3^2~2 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bf0eb89656060958f09942052536f7414ee6c582;p=collectd.git Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json --- bf0eb89656060958f09942052536f7414ee6c582