[FFmpeg-cvslog] Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  5 04:05:48 2014 +0200| [77b789b4063578e14d59c970b21597739c7f9fd1] | committer: Michael Niedermayer

Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2

* commit '07015d9f913d63bdc4495e75f4603c586553796e':
  Update Changelog for v10.3

Conflicts:
	Changelog

Not merged as it does not match our release

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

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