[FFmpeg-cvslog] Merge commit '0e810255596070e2c503c5da9001f7087f71de6e' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 23:12:31 2015 +0100| [509239066ad0359ec4183ff49884e010d471f852] | committer: Michael Niedermayer

Merge commit '0e810255596070e2c503c5da9001f7087f71de6e' into release/0.10

* commit '0e810255596070e2c503c5da9001f7087f71de6e':
  doc: More changelog updates for v0.8.17

Conflicts:
	Changelog

not merged

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

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