From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 1 May 2010 08:56:14 +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=28642062711c22bab3a06d2b3c39a9b1a88b1199;p=xonotic%2Fxonotic-maps.pk3dir.git

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

28642062711c22bab3a06d2b3c39a9b1a88b1199