From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Mon, 2 Aug 2010 10:38:09 +0000 (+0300)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcffce4897ed31c04015ab8fbaeb8cae7e83450f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
---

bcffce4897ed31c04015ab8fbaeb8cae7e83450f