[FFmpeg-cvslog] Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 29 03:10:10 2014 +0200| [a907fc0b21fadfdb92721843b75fa629d26297c8] | committer: Michael Niedermayer

Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10

* commit 'e122fb594a5feb6729cce86a70aafd93d10202d8':
  Update Changelog for 0.8.13
  Prepare for 0.8.13 Release

Conflicts:
	Changelog
	RELEASE

merge for metadata only

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

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