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)
* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
  Update Changelog

Conflicts:
Changelog

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

Trivial merge