Browse code

Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1

* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
update Changelog

Conflicts:
Changelog

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

Michael Niedermayer authored on 2014/05/05 23:21:25
Showing 0 changed files