From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:27:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/techassault'
X-Git-Tag: xonotic-v0.7.0~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b12732c5d6ba31a83ddbeeed442fb01a4a2f4725;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/techassault'
---

b12732c5d6ba31a83ddbeeed442fb01a4a2f4725