Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 02:45:30 +0000 (04:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 02:45:30 +0000 (04:45 +0200)
commit2178abd3b5311dd334f0380ea9521b18e4f2e564
tree11f8be8a7c9963b62218549f4bdc017fcb430325
parent52ec81c67d112ca8f1a0ae779a4b6e0f27f47ba3
parentd7913bf59ccbf781ce57c5d58998e8f25d10e040
Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'

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

Conflicts:
Changelog

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