[FFmpeg-cvslog] Merge commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 13:28:40 2015 +0100| [1177e047f1661d902fa2f6db32218199f41fdd89] | committer: Michael Niedermayer

Merge commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c' into release/2.2

* commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c':
  doc: More changelog updates for v10.6

Conflicts:
	Changelog

not merged

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

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