[FFmpeg-cvslog] Merge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 19:00:30 2014 +0200| [a94fe0e15148435a32ecde30b984de79751bd094] | committer: Michael Niedermayer

Merge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10

* commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200':
  Update Changelog for v0.8.14
  Prepare for 0.8.14 Release

Conflicts:
	Changelog
	RELEASE

No change as this does not apply to FFmpeg 1:1

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

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