[FFmpeg-cvslog] Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:20:35 2014 +0200| [ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7] | committer: Michael Niedermayer

Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

* commit 'd791e8c990a752435d993df01516ebe469d94535':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
	doc/platform.texi

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

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