Merge commit '42eaec076bbe2629c466695f71e7aa283a6fda51' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:38:18 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:38:18 +0000 (13:38 +0100)
* commit '42eaec076bbe2629c466695f71e7aa283a6fda51':
  Prepare for 9.18 Release

Conflicts:
RELEASE

not merged

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

Trivial merge