Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:38:44 +0000 (12:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:38:44 +0000 (12:38 +0100)
commite48f2847aba795ac62dcc2aea7c176eb2833c168
treeea34e926fc796ce29ac022cf12119c568e01a221
parent71c63e799f3aedeab00538714caf7c7023b3ca2b
parentf74f4a540151aacb38306f2e41a160c326be3d51
Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2

* commit 'f74f4a540151aacb38306f2e41a160c326be3d51':
  Prepare for 10.6 Release

Conflicts:
RELEASE

Not merged

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