Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 14:21:25 +0000 (16:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 14:21:25 +0000 (16:21 +0200)
* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
  update Changelog

Conflicts:
Changelog

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

Trivial merge