[FFmpeg-cvslog] Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 19 22:06:12 2014 +0100| [ca5b45b9b3cb488e6b7d76a7db8befff98acf640] | committer: Michael Niedermayer

Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'

* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
  doc: Sort the muxer documentation

Conflicts:
	doc/muxers.texi

No change as ours was already sorted

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

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