From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 29 Jul 2010 22:53:36 +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=7fd88dce6f50bbdfcd106fe1300f4e78546eb823;p=xonotic%2Fxonotic-maps.pk3dir.git

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

7fd88dce6f50bbdfcd106fe1300f4e78546eb823