From: Mario <mario@smbclan.net>
Date: Mon, 27 Jun 2016 01:56:30 +0000 (+1000)
Subject: Merge branch 'Mario/grenade_prediction_fix'
X-Git-Tag: xonotic-v0.8.2~700^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1083bfae3d46241150aea36cada1f59bc1afa43;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/grenade_prediction_fix'
---

a1083bfae3d46241150aea36cada1f59bc1afa43