From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 5 Aug 2010 17:52:43 +0000 (+0200)
Subject: Merge remote branch 'origin/savagex/assaultfixes'
X-Git-Tag: xonotic-v0.1.0preview~266^2~15
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=04e26d20ce0bf24514128a1e89b5fd37bc3e2fd5

Merge remote branch 'origin/savagex/assaultfixes'
---

04e26d20ce0bf24514128a1e89b5fd37bc3e2fd5