Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 02:05:48 +0000 (04:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 02:05:48 +0000 (04:05 +0200)
commit77b789b4063578e14d59c970b21597739c7f9fd1
tree46fb8a64128d22cc7339682a3d9516ed6ea2c908
parent9ed1aa0465b3377dec860bcfe8144533b9ea9d68
parent07015d9f913d63bdc4495e75f4603c586553796e
Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2

* commit '07015d9f913d63bdc4495e75f4603c586553796e':
  Update Changelog for v10.3

Conflicts:
Changelog

Not merged as it does not match our release

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