[FFmpeg-cvslog] Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 30 20:38:41 2014 +0200| [f953c3c2343dc78c45a001aa38ecb20cee447df7] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f953c3c2343dc78c45a001aa38ecb20cee447df7
---