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)
commitd32ea79ea2afdca9f7a3979dc4294b5275d410be
tree96c93177cd6ca665c0d33e866b001c288f8efef7
parent57eb787ed3fabe4eb996aa2aad3fd4b10fa5c878
parent6b156c45638ceb2e076586b7efeb4cf9e04e0a84
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

* qatar/release/0.6:
  Release notes and changelog for 0.6.4

Conflicts:
Changelog

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