add (undocumented) _CURL_HTTP_PROXY
add notification to subscribe dialog when multiple feeds are detected
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Merge remote-tracking branch 'upstream/master'