[FFmpeg-cvslog] Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 23:02:56 2014 +0100| [835f41376da1250a68a7d8c90fe3dc4049051fad] | committer: Michael Niedermayer

Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7'

* commit 'd15c536123a44362ace6299c391a492c90b83fc7':
  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=835f41376da1250a68a7d8c90fe3dc4049051fad
---