From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 17:43:47 +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=606abbf53469f3ff9e0527e54f1ba3981d8391fe;p=xonotic%2Fxonotic-maps.pk3dir.git

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

606abbf53469f3ff9e0527e54f1ba3981d8391fe