From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 20 Jul 2010 17:42:19 +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=42fc523dc8c1f3538baa9e4d38c5d746c9999cef;p=xonotic%2Fxonotic-maps.pk3dir.git

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

42fc523dc8c1f3538baa9e4d38c5d746c9999cef