From: mand1nga <mand1nga@xonotic.org>
Date: Tue, 19 Apr 2011 01:41:08 +0000 (-0300)
Subject: Merge remote branch 'origin/mirceakitsune/multijump_fix'
X-Git-Tag: xonotic-v0.5.0~109^2~24^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ddfc58d6025162baedbbd4974a60e7e7e66f65b1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/multijump_fix'
---

ddfc58d6025162baedbbd4974a60e7e7e66f65b1