From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 1 Nov 2010 21:14:48 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/jumppadlod'
X-Git-Tag: xonotic-v0.1.0preview~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff4c0cb9fda2a4f457d0476941abe0c8d587a840;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/jumppadlod'
---

ff4c0cb9fda2a4f457d0476941abe0c8d587a840