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:
Michael Niedermayer 2015-03-10 13:38:18 +01:00
commit c5587516ca

Diff content is not available