Merge remote branch 'origin/mirceakitsune/red_planet'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:02:06 +0000 (20:02 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:02:06 +0000 (20:02 -0300)
commitafdbed21824891bcc8185b951c6d232313d349cf
tree4ad95c99d50a631d2b89d399e3f4baddf65359a7
parenta4c63b16df9fe5bc595fc4b926032944e363a694
parent0835d305e0c9326c7e99f065d8cfa2af1536b438
Merge remote branch 'origin/mirceakitsune/red_planet'