Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:38:41 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:38:41 +0000 (20:38 +0200)
commitf953c3c2343dc78c45a001aa38ecb20cee447df7
treed418b2fd2b0ebcf44ad262f3bd2c3d53df892fbf
parentdcce698fd88768264614eb139fc62b2340bff787
parentbd41211395fd1f968e9f3a4746daffebea60f41e
Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1

* commit 'bd41211395fd1f968e9f3a4746daffebea60f41e':
  Re-release 9.15 as 9.16
  Prepare for 9.15 Release
  Update Changelog for v9.15

Conflicts:
Changelog
RELEASE

Not merged, as the versions are different in FFmpeg

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