Merge branch 'master' of gitlab.com:xonotic/mediasource into sev/hud_ctf_update 11/head
authorSeverin Meyer <sev.ch@web.de>
Sat, 8 Oct 2016 13:03:52 +0000 (15:03 +0200)
committerSeverin Meyer <sev.ch@web.de>
Sat, 8 Oct 2016 13:03:52 +0000 (15:03 +0200)

Trivial merge