Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:03:54 +0000 (21:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:03:54 +0000 (21:03 +0200)
commita6ba5184a5e2a224f4f62bbb736b68dc416120fe
treec9292aa0f3e080d912b2dce77c369cfe2de7a4a4
parent6eefc578a5c439fc8df3733533236eb5189f2de1
parent968a62a9d9e3a785ce1f79b80facfe09c6c14544
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@gmx.at>