Merge commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 14:08:16 +0000 (16:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 14:08:16 +0000 (16:08 +0200)
* commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4':
  Update Changelog for v9.15

Conflicts:
Changelog

Not merged as the changelog doesnt apply 1:1 to FFmpeg

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

Trivial merge