From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Nov 2014 00:24:59 +0000 (+1100)
Subject: Merge branch 'terencehill/aim_shake_fix'
X-Git-Tag: xonotic-v0.8.0~133
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f183059a6e71a2aa69a9bb3490305b81a267fe45;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/aim_shake_fix'
---

f183059a6e71a2aa69a9bb3490305b81a267fe45