Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 21:06:12 +0000 (22:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 21:06:12 +0000 (22:06 +0100)
* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
  doc: Sort the muxer documentation

Conflicts:
doc/muxers.texi

No change as ours was already sorted

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

Trivial merge