Merge pull request #2986 from shastah/feature/curl-address-family

curl plugin: add AddressFamily

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
Simple merge