From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 26 Apr 2010 21:38:04 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/multijump
X-Git-Tag: xonotic-v0.1.0preview~361^2~11^2~9
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=9301604b1b5894e57227d32785b9a9460e9a3f51

Merge branch 'master' into mirceakitsune/multijump
---

9301604b1b5894e57227d32785b9a9460e9a3f51