Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:31:57 +0000 (17:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:31:57 +0000 (17:31 +0200)
commita05f86ec101f2c3ee48758f03fca3125dbbf83b8
treef3ae4a4d63a36bc551df04fba518fb0a57629448
parent9bdb254b980fef48bead17197a2821ca06509301
parent8e9e57ed0c7f40741da1ca83e52c851263e0c168
Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2

* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
  Update Changelog

Conflicts:
Changelog

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