Merge branch 'collectd-4.10' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:40:14 +0000 (13:40 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:41:34 +0000 (13:41 +0100)
commitd6021a800b12c89b5a78877af2c5b9abc1a8e609
treea151617151e3da792176c610dc88a352954d2ce5
parente33a2a5fffa6e57f8cea775ce2201606d49e155f
parent56c7b21899e44b57b5031a21ca3652b30f4fc1aa
Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
src/curl_json.c
src/apache.c
src/bind.c
src/curl.c
src/curl_json.c
src/exec.c
src/mysql.c
src/nginx.c
src/write_http.c