tree 26e2dd3383cf753020e993d3c4b07e0faa3815a3
parent 0e05292a6c443bc3eec160d5b0af107bb91e074d
parent d0688fdd3101d900a3e3aac4e36bf7ef1eae01ad
author Michael Niedermayer <michaelni@gmx.at> 1324840753 +0100
committer Michael Niedermayer <michaelni@gmx.at> 1324840753 +0100

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>