[FFmpeg-cvslog] Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 01:30:35 2014 +0200| [a125f87ac49b18c57a0bedb6ce44329a4aa70cef] | committer: Michael Niedermayer

Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
	configure
	doc/platform.texi

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

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