From: Mario <zacjardine@y7mail.com>
Date: Tue, 3 Jan 2017 01:34:31 +0000 (+0000)
Subject: Merge branch 'terencehill/keyhunt' into 'master'
X-Git-Tag: xonotic-v0.8.2~327
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f0a82d2bc29ba96f21d97d1c04956389ef6d7b90;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/keyhunt' into 'master'

Keyhunt improvements

Closes #1843 and #1837

See merge request !402
---

f0a82d2bc29ba96f21d97d1c04956389ef6d7b90