[FFmpeg-cvslog] Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 04:02:57 2014 +0100| [251331491299ae89732203edc16d9b6a06f2bd79] | committer: Michael Niedermayer

Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2

* commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa':
  http: Improve options descriptions

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=251331491299ae89732203edc16d9b6a06f2bd79
---