Merge commit '473281193bed8dcb3f6954a18d03cf6298d651b3' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:37:42 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:37:42 +0000 (13:37 +0100)
commit94bd5793198e13cca6bc4a73795532df8bc6f62e
tree446560838fe3747ec6ed509a22aab996535b9934
parenteb6d64edef4d965c228b122f5c7e018831362c82
parent473281193bed8dcb3f6954a18d03cf6298d651b3
Merge commit '473281193bed8dcb3f6954a18d03cf6298d651b3' into release/1.1

* commit '473281193bed8dcb3f6954a18d03cf6298d651b3':
  Update Changelog for v9.18

Conflicts:
Changelog

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