Merge commit '798b3ed3fbc31672e6400e18db37deef03fff44f' into release/1.1

* commit '798b3ed3fbc31672e6400e18db37deef03fff44f':
  doc: More changelog updates for v9.18

Conflicts:
	Changelog

not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-10 14:13:56 +01:00

Diff Content Not Available