[FFmpeg-cvslog] Merge commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 01:03:19 2014 +0200| [53dcd772aa1f53706f1fa96350a47b90d5c4fe7d] | committer: Michael Niedermayer

Merge commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832' into release/0.10

* commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832':
  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=53dcd772aa1f53706f1fa96350a47b90d5c4fe7d
---