[FFmpeg-cvslog] Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 21:03:54 2014 +0200| [a6ba5184a5e2a224f4f62bbb736b68dc416120fe] | committer: Michael Niedermayer

Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'

* commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544':
  doc/APIchanges: mark the release 10 branch point

Conflicts:
	doc/APIchanges

Not merged, as there was no such branch in ffmpeg

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

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