From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 20 Dec 2014 09:26:11 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/features/jetpack_jump
X-Git-Tag: xonotic-v0.8.0~52^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17a1111fdba07eb4323a700e72bb75537afee99a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/features/jetpack_jump
---

17a1111fdba07eb4323a700e72bb75537afee99a