Code

Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json
authorFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 07:04:45 +0000 (09:04 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 07:04:45 +0000 (09:04 +0200)
1  2  3 
src/collectd.conf.pod
src/curl_json.c

Simple merge
diff --cc src/curl_json.c
Simple merge