From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 2 Jul 2010 12:34:04 +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=7d4f6a5d53a37d805f5d8d48c9c58dad3c4bf968;p=xonotic%2Fxonotic-maps.pk3dir.git

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

7d4f6a5d53a37d805f5d8d48c9c58dad3c4bf968