From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 09:22:08 +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=2f9ee4bbc2d4d50fe3cb48c1c66c14ba2e9a4f9d;p=xonotic%2Fxonotic-maps.pk3dir.git

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

2f9ee4bbc2d4d50fe3cb48c1c66c14ba2e9a4f9d