From: Mario <zacjardine@y7mail.com>
Date: Mon, 29 Dec 2014 00:50:51 +0000 (+0000)
Subject: Merge branch 'TimePath/issues/1438,1439' into 'master'
X-Git-Tag: xonotic-v0.8.0~41
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2fe6110952eb06529262b100313713451c0a36b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/issues/1438,1439' into 'master'

Jetpack spam

Fixes #1438 and #1439

See merge request !74
---

f2fe6110952eb06529262b100313713451c0a36b