Merge remote-tracking branch 'qatar/release/0.6' into release/0.6 n0.6.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 19:11:09 +0000 (20:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 19:11:09 +0000 (20:11 +0100)
* qatar/release/0.6:
  Release notes and changelog for 0.6.4

Conflicts:
Changelog

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

diff --cc Changelog
Simple merge