From: Florian Forster <octo@collectd.org>
Date: Sun, 18 Aug 2013 08:03:52 +0000 (+0200)
Subject: Merge branch 'jr/json'
X-Git-Tag: collectd-5.4.0~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8df4f1b9b3a47e75673b410b968aa4e35144cb14;p=collectd.git

Merge branch 'jr/json'
---

8df4f1b9b3a47e75673b410b968aa4e35144cb14