From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 6 Jun 2010 18:47:10 +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=1a5d42fa9e22c86a1276b0475c5669348a69969c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

1a5d42fa9e22c86a1276b0475c5669348a69969c