Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:09:47 +0000 (17:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:09:47 +0000 (17:09 +0200)
commit6452b3159982565a56621f1d5a77b6a6e5306f70
tree17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7
parenta14969253a6cbb2958bf7c39acbb7d0056219111
parente2a83d72da866a29f5307a56f66c469966f02473
Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2

* commit 'e2a83d72da866a29f5307a56f66c469966f02473':
  Update Changelog for v10.1

Conflicts:
Changelog

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