Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 18:25:27 +0000 (19:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 18:25:27 +0000 (19:25 +0100)
commit8413f12e1b234e633389c75c403d9aa712c9ef47
tree45759720297eb50f0e8b0057c1b3217761eb2237
parentdf825c956af76ae04af18dc00403bf1a0e745af1
parentd61b38b9db9bdc5e98f529c043767f8fd5369859
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  Update Changelog for 0.7.3 release

Conflicts:
Changelog

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