Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:06:49 +0000 (04:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:06:49 +0000 (04:06 +0100)
commitc7b8f02940ecb911fde566a578f3aae2eddf302f
treedbd5cafcfa7d7255284c0cd9967250601e5ab8de
parent8a9feeff9e31e04bbd43a6279e89cba66a3691de
parent606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248
Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1

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

Conflicts:
Changelog

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