[FFmpeg-cvslog] Merge commit '42604902292ebaba39b13e8efd98419908518019'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 18 10:24:23 2014 +0200| [ca2160b5b3d9aec02d7c1d93e445b8cfb9c7716c] | committer: Michael Niedermayer

Merge commit '42604902292ebaba39b13e8efd98419908518019'

* commit '42604902292ebaba39b13e8efd98419908518019':
  Prepare for 11_beta1 Release

Conflicts:
	RELEASE

No change, not merged

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

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