[FFmpeg-cvslog] Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  5 04:45:30 2014 +0200| [2178abd3b5311dd334f0380ea9521b18e4f2e564] | committer: Michael Niedermayer

Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'

* commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040':
  changelog: Move Ogg subtypes aliases entry to the correct release

Conflicts:
	Changelog

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

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