Merge remote-tracking branch 'origin/mirceakitsune/mutator_relics'
authormand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:12:25 +0000 (20:12 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:12:25 +0000 (20:12 -0300)
commita18d7f62e16089d413a231beefc138c8f3e91dde
treed070b9cf2043f7625f60fe050cd77144ee5f4ede
parentede2d0f3f48122dc53557eef01beb3ccc1a9c4b6
parent752b344bde90f436e366944c429f71b06eef60a1
Merge remote-tracking branch 'origin/mirceakitsune/mutator_relics'