[FFmpeg-cvslog] Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 25 12:09:29 2014 +0200| [f1b04f803eafa17dbfa19977b1a76f412183478e] | committer: Michael Niedermayer

Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'

* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

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

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