From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 1 May 2011 23:12:25 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/mirceakitsune/mutator_relics'
X-Git-Tag: xonotic-v0.5.0~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a18d7f62e16089d413a231beefc138c8f3e91dde;p=xonotic%2Fmediasource.git

Merge remote-tracking branch 'origin/mirceakitsune/mutator_relics'
---

a18d7f62e16089d413a231beefc138c8f3e91dde