From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 17 Jun 2010 13:17:43 +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=a0b22939fa992701c1b2460a1189759eda5c4eb3;p=xonotic%2Fxonotic-maps.pk3dir.git

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

a0b22939fa992701c1b2460a1189759eda5c4eb3