Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1

* commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248':
  Update Changelog for v9.17

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-21 04:06:49 +01:00

Diff Content Not Available