Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 18:48:07 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 18:48:07 +0000 (20:48 +0200)
commitffa90d99fd8933b17917045a3768bb9dcfb56f72
tree0d307a55c1ed7a8d826e81f861b0adf87c53a37d
parent7206221d563e6d1d6bf2d5acd3b1378d77c7b7e4
parent56a721f020273d69daa8dcb0d99e42a43a0a0d4d
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'

* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
  doc: fix a typo

Conflicts:
doc/APIchanges

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