Merge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:47:08 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:48:19 +0000 (13:48 +0200)
* commit '3ecbd911ff9177097820e5d00401c9bf29e5d167':
  Update Changelog for v9.14
  Prepare for 9.14 Release

Conflicts:
Changelog
RELEASE

Not merged as this doesnt apply 1:1 to our releases

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

Trivial merge