From: Samual Lenks <samual@xonotic.org>
Date: Tue, 7 May 2013 05:43:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/assault_mutator'
X-Git-Tag: xonotic-v0.7.0~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf83d4469f1ac84d58e7ebae155274c4686eefea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/assault_mutator'
---

bf83d4469f1ac84d58e7ebae155274c4686eefea