From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 22 May 2010 20:45:57 +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=dde945461fd8094bcc0717d296cfce2bd7593232;p=xonotic%2Fxonotic-maps.pk3dir.git

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

dde945461fd8094bcc0717d296cfce2bd7593232