From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 29 May 2010 16:03:51 +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=69ef44eec8c20c29721f07137b359af9ef131203;p=xonotic%2Fxonotic-maps.pk3dir.git

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

69ef44eec8c20c29721f07137b359af9ef131203