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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 16:21:25 2014 +0200| [714dd84f204fa210d7a727879ad6d7c4452e0bf8] | committer: Michael Niedermayer

Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1

* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
  update Changelog

Conflicts:
	Changelog

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

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