Merge commit '470fd8e64e292d2336b2b860437dcbc053ba9eec' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:40:22 +0000 (12:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:40:22 +0000 (12:40 +0100)
commit895ddf1a80f28a3d81b016e4bc8bd10b519d4f26
treeea34e926fc796ce29ac022cf12119c568e01a221
parente48f2847aba795ac62dcc2aea7c176eb2833c168
parent470fd8e64e292d2336b2b860437dcbc053ba9eec
Merge commit '470fd8e64e292d2336b2b860437dcbc053ba9eec' into release/2.2

* commit '470fd8e64e292d2336b2b860437dcbc053ba9eec':
  Update Changelog for v10.6

Conflicts:
Changelog

not merged

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