From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 8 May 2010 19:50:16 +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=49857804d92f624343711844bfc32e6926c17677;p=xonotic%2Fxonotic-maps.pk3dir.git

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

49857804d92f624343711844bfc32e6926c17677