Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:19:35 +0000 (14:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:19:46 +0000 (14:19 +0200)
commit1fabe4ae8cc07d80c735bb45858f542bb0aea944
tree732bdb68e4a952772d4330284f8d5fe187ee4dce
parent4ccde2d356e73430738380cb8b94575bdf707f9b
parentf1a2364cebe472a98a5ea157071f4eee4429ce9f
Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
  Update Changelog for 9.12

Conflicts:
Changelog

Not merged, as the changelog does not apply to FFmpeg like this

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