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

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

4bc26d6c3f74f6e5f70e108de2170642dce10a08