Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 11:05:31 +0000 (13:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 12:49:28 +0000 (14:49 +0200)
commit835bc39b2608c4e8167e06b1c8606acfa09af409
treedd81e474ae519e83fbb3cea187910b35a1b4544c
parent2a7bdbf67efbb7061957f52ef81f49e6c06cfd54
parentbb81b2b2e06abbf713094f8b77b4cbd550c02503
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  Fix top-level description
  update Changelog

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