From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 27 Jun 2010 21:07:13 +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=dfc582ecb6d8e9fab09091930861c677266ce3fe;p=xonotic%2Fxonotic-maps.pk3dir.git

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

dfc582ecb6d8e9fab09091930861c677266ce3fe