[FFmpeg-cvslog] Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 17:03:53 2014 +0200| [a14969253a6cbb2958bf7c39acbb7d0056219111] | committer: Michael Niedermayer

Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2

* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5':
  Add missing changelog entries for v10

Conflicts:
	Changelog

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

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