[FFmpeg-cvslog] Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2

[Michael Niedermayer]

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

Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2

* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76':
  http: Add support for selecting a request range

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=bcc25353cf259ee63df4c2147630259cd90c8cd5
---