From: FruitieX <fruitiex@gmail.com>
Date: Mon, 15 Nov 2010 17:26:55 +0000 (+0200)
Subject: Merge branch 'master' into savagex/techassault
X-Git-Tag: xonotic-v0.5.0~111^2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7c3e65185181fccc4bb749ef12a8978e096f7e5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into savagex/techassault
---

b7c3e65185181fccc4bb749ef12a8978e096f7e5