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

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 03:12:28 2014 +0100| [dde996bf999a2b4ec155e78a7b6b1cd66830fb9d] | committer: Michael Niedermayer

Merge commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f' into release/2.2

* commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f':
  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=dde996bf999a2b4ec155e78a7b6b1cd66830fb9d
---