From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 29 Jun 2010 08:14:04 +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=4419e9fdc061424be58aa5d2c1cf63e6373545ac;p=xonotic%2Fxonotic-maps.pk3dir.git

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

4419e9fdc061424be58aa5d2c1cf63e6373545ac