Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:40:39 +0000 (04:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:49:15 +0000 (04:49 +0200)
* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
  doc: Use a 3 columns multitable

Conflicts:
doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

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

Trivial merge