From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 24 Jun 2010 10:05:56 +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=aae136c2af0ebb387d536c3a4ce2baf1e707f5c7;p=xonotic%2Fxonotic-maps.pk3dir.git

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

aae136c2af0ebb387d536c3a4ce2baf1e707f5c7