From: Mario <zacjardine@y7mail.com>
Date: Mon, 27 Jul 2015 16:22:28 +0000 (+0000)
Subject: Merge branch 'terencehill/ka_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.1~36^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e85850478a0174700ab365d6a642a2a420d78f8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/ka_fixes' into 'master'

Keepaway fixes



See merge request !147
---

1e85850478a0174700ab365d6a642a2a420d78f8