Merge commit '798b3ed3fbc31672e6400e18db37deef03fff44f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:13:56 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:13:56 +0000 (14:13 +0100)
* commit '798b3ed3fbc31672e6400e18db37deef03fff44f':
  doc: More changelog updates for v9.18

Conflicts:
Changelog

not merged

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

Trivial merge