Merge commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 10:08:09 +0000 (12:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 10:08:26 +0000 (12:08 +0200)
* commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a':
  doc: fix typing mistake

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

diff --cc doc/APIchanges
Simple merge