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)
commitc5587516ca9155d575b9dd584ea746ebc2e333bd
tree446560838fe3747ec6ed509a22aab996535b9934
parent94bd5793198e13cca6bc4a73795532df8bc6f62e
parent42eaec076bbe2629c466695f71e7aa283a6fda51
Merge commit '42eaec076bbe2629c466695f71e7aa283a6fda51' into release/1.1

* commit '42eaec076bbe2629c466695f71e7aa283a6fda51':
  Prepare for 9.18 Release

Conflicts:
RELEASE

not merged

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