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

[Michael Niedermayer]

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

Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2

* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd':
  http: Always allow no-op seek

Conflicts:
	libavformat/http.c

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

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