Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 19:19:13 +0000 (20:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Dec 2011 19:19:13 +0000 (20:19 +0100)
commit8755a7890ec60d26c387db5cb48470bcf1f6630e
tree26e2dd3383cf753020e993d3c4b07e0faa3815a3
parent0e05292a6c443bc3eec160d5b0af107bb91e074d
parentd0688fdd3101d900a3e3aac4e36bf7ef1eae01ad
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Release notes and changelog for 0.5.6

Conflicts:
RELEASE

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