[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

New commits:
commit d0bf11d455b9da5770382f3cd20667723f1bbdb5
Merge: 574fa99 f6b9d3b
Author: Florian Forster <octo at collectd.org>
Date:   Fri Sep 20 15:32:27 2013 +0200

    Merge remote-tracking branch 'origin/master'

commit 574fa997d35e2a187d87b17e755eb8d9995bcb1d
Merge: b627a68 e46350d
Author: Florian Forster <octo at collectd.org>
Date:   Fri Aug 9 07:23:45 2013 +0200

    Merge branch 'pr/392'

commit e46350dc65f17d840c897d3e8caf97db67948f55
Author: Jim Radford <radford at galvanix.com>
Date:   Thu Aug 8 09:33:36 2013 -0700

    curl_json plugin: style cleanups

commit 712c0a416128c6c742dd2721140222a28c009c22
Author: Jim Radford <radford at galvanix.com>
Date:   Thu Aug 8 09:31:46 2013 -0700

    curl_json plugin: use sstrerr for thread safety

commit 1f8f016bd1ab08f33c16b4589b0371c81d66b122
Author: Jim Radford <radford at galvanix.com>
Date:   Wed Aug 7 13:05:02 2013 -0700

    curl_json plugin: support getting json from a Unix socket as well as a URL

commit 5b20fd7fdf4975ae056088f7d9b33b2a5cfe205c
Author: Jim Radford <radford at galvanix.com>
Date:   Wed Aug 7 12:39:51 2013 -0700

    curl_json plugin: separate the cj_curl_perform in to the curl and yajl parts