Merge commit '42eaec076b' into release/1.1
* commit '42eaec076b':
Prepare for 9.18 Release
Conflicts:
RELEASE
not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c5587516ca