From: Mirio <opivy@hotmail.de>
Date: Mon, 2 Oct 2017 14:06:49 +0000 (+0000)
Subject: Merge branch 'typofix' into 'master'
X-Git-Tag: xonotic-v0.8.5~2457
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=6841906bdedacb27e6e8c3fa5dc907f927409529;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'typofix' into 'master'

someone got too close _to_ someones rocket

See merge request xonotic/xonotic-data.pk3dir!500
---

6841906bdedacb27e6e8c3fa5dc907f927409529