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)
commitca5b45b9b3cb488e6b7d76a7db8befff98acf640
tree635f3f8e878188044411a8f8939fb4af80d71e4c
parent0a30ad34735745c0e0f1610ab43c205255527f00
parenta7b3216cbdc7796a9d14cd22a863fae3556098ba
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@gmx.at>