[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

[Michael Niedermayer]

ffmpeg | branch: release/0.5 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 17 22:06:56 2013 +0200| [b5f685211cd49dbd5b821f4ff1dc345c9326ff78] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Bump version number for the 0.5.11 release
  update year to 2013

Conflicts:
	VERSION

Merge is for metadata only, issues have been fixed in previous commits
already

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

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