From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 10:04:52 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/jumppadmodel1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59c8ae5e42870c7a85498228924ed488dc398c47;p=xonotic%2Fxonotic-maps.pk3dir.git

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

59c8ae5e42870c7a85498228924ed488dc398c47