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)
commitbf0eb89656060958f09942052536f7414ee6c582
treef541581cc04649d195bf55f1b4f49b468beb1472
parent912afef242385f87fb9651ec0b54e4bf1561f73e
parent793bec1c1dc3e6bb9479ed5be3c37d58119778dd
parenta5520423233b4ead083030661a256058db562564
Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json
src/collectd.conf.pod
src/curl_json.c