[FFmpeg-cvslog] Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:38:07 2014 +0100| [6a10263f163af66f9e143cb0ba206cb99e78e605] | committer: Michael Niedermayer

Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2

* commit '09dca5106698871920328ae8041d1437ce3cff43':
  http: Support setting custom User-Agent

Conflicts:
	doc/protocols.texi
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a10263f163af66f9e143cb0ba206cb99e78e605
---