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

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