From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 13 May 2010 11:38:18 +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=49d9a89c3205b1f8f443aeb5cbb69d948b7cada5;p=xonotic%2Fxonotic-maps.pk3dir.git

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

49d9a89c3205b1f8f443aeb5cbb69d948b7cada5