From: terencehill <piuntn@gmail.com>
Date: Mon, 20 Aug 2018 19:19:15 +0000 (+0200)
Subject: Merge branch 'terencehill/keepaway_enhancements'
X-Git-Tag: xonotic-v0.8.5~1924
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a295e36ce93f87f6342b4bd0cdaebcc7faa69da;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/keepaway_enhancements'
---

2a295e36ce93f87f6342b4bd0cdaebcc7faa69da