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

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 17:09:47 2014 +0200| [6452b3159982565a56621f1d5a77b6a6e5306f70] | committer: Michael Niedermayer

Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2

* commit 'e2a83d72da866a29f5307a56f66c469966f02473':
  Update Changelog for v10.1

Conflicts:
	Changelog

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

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