tree 0d676e9353b085c1d9307389e7695a2c9f9bcecb
parent acc665f22c5c2cb8a507c6ca49756995a4742038
parent 6ec1d3b3bafa59363763631a8e090b2e12f6ef33
author Michael Niedermayer <michaelni@gmx.at> 1339261351 +0200
committer Michael Niedermayer <michaelni@gmx.at> 1339261351 +0200

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Release notes for 0.5.9
  Update changelog for 0.5.9 release

Conflicts:
	RELEASE

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