From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 9 Jul 2010 09:19:52 +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=932cc14aaf3a47c290ef21488ee85642c8917864;p=xonotic%2Fxonotic-maps.pk3dir.git

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

932cc14aaf3a47c290ef21488ee85642c8917864