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

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 00:57:09 2014 +0200| [2f894deeda18bf9162d7ceb96fa83253e331a37e] | committer: Michael Niedermayer

Merge commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23' into release/0.10

* commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23':
  Update Changelog for 0.8.11
  configure: Update freetype check to follow upstream

Conflicts:
	Changelog

Changelog not merged as it does not match for FFmpeg

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

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