Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 10 May 2016 09:52:36 +0000 (11:52 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 10 May 2016 09:52:36 +0000 (11:52 +0200)
commit56536633afb68ded68ac7bd012060cb9337fbcc5
treedfae0cb744a6a325cba922f49ebf2265eb24064e
parent00f086d5165423665476c7ffe5c9c47b1497fb34
parent70cb50ea9a7aa0554c3874862192b5ca3b1283d5
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
src/Makefile.am
configure.ac
src/Makefile.am
src/collectd.conf.pod
src/curl.c
src/curl_json.c
src/curl_xml.c
src/processes.c
src/statsd.c