From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 30 Jul 2010 12:55:24 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/jumppadmodel1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b17138ef0518d31bbf0ec0d21ec6916f8041544;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/jumppadmodel1
---

2b17138ef0518d31bbf0ec0d21ec6916f8041544