[FFmpeg-cvslog] Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 23:46:44 2014 +0200| [ebd74c42a259b77b549a9135c1099921de5d3e0e] | committer: Michael Niedermayer

Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1

* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528':
  Update Changelog for v9.13

Conflicts:
	Changelog

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

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