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)
commita14969253a6cbb2958bf7c39acbb7d0056219111
tree17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7
parentfab9a7be76eec79c1dab4974307628bbe00d3a46
parent6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5
Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2

* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5':
  Add missing changelog entries for v10

Conflicts:
Changelog

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