From: Mirio <opivy@hotmail.de>
Date: Sun, 31 Dec 2017 12:37:10 +0000 (+0000)
Subject: Merge branch 'typo' into 'master'
X-Git-Tag: xonotic-v0.8.5~2395
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2590bde8cc2b5bf0055224535ecd84fb2c02d091;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'typo' into 'master'

Fix typo

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

2590bde8cc2b5bf0055224535ecd84fb2c02d091