Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:03:53 +0000 (17:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:03:53 +0000 (17:03 +0200)
* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5':
  Add missing changelog entries for v10

Conflicts:
Changelog

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

Trivial merge