From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 17:10:24 +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=d276a0bc1b674da99010250402cb878de849ece2;p=xonotic%2Fxonotic-maps.pk3dir.git

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

d276a0bc1b674da99010250402cb878de849ece2