[FFmpeg-cvslog] Merge commit '470fd8e64e292d2336b2b860437dcbc053ba9eec' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 12:40:22 2015 +0100| [895ddf1a80f28a3d81b016e4bc8bd10b519d4f26] | committer: Michael Niedermayer

Merge commit '470fd8e64e292d2336b2b860437dcbc053ba9eec' into release/2.2

* commit '470fd8e64e292d2336b2b860437dcbc053ba9eec':
  Update Changelog 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=895ddf1a80f28a3d81b016e4bc8bd10b519d4f26
---