Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:57:48 +0000 (22:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:57:48 +0000 (22:57 +0200)
commit7c81afdba59f59e2e6d55a1ef72b1f42de8e66fc
tree3b2c5896714825367d45dcb01b57e0a600113bf7
parent65b839e43a5b32dabef63572a584e81528c2f956
parent40dd29653ab85812d21fa64e9a665ceb316701ad
Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2

* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
  Prepare for 10.2 Release
  Update Changelog for v10.2

Conflicts:
Changelog
RELEASE

Not merged as these dont align with our releases

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