Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:46:44 +0000 (23:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:46:44 +0000 (23:46 +0200)
commitebd74c42a259b77b549a9135c1099921de5d3e0e
treebb37ebf66a920fb6059b2a159a8dca21e3ca3374
parent0597f052372b9e5877af7ad8b1e632d511931db6
parent1f5678c5e404ebd326f6eae1b527beadaa85a528
Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1

* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528':
  Update Changelog for v9.13

Conflicts:
Changelog

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