From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 13:56:33 +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=477b6f3f5d9230572be365a128be3d1f55cb492c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

477b6f3f5d9230572be365a128be3d1f55cb492c