Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
authorSeverin Meyer <sev.ch@web.de>
Thu, 9 Jul 2015 08:52:25 +0000 (10:52 +0200)
committerSeverin Meyer <sev.ch@web.de>
Thu, 9 Jul 2015 08:52:25 +0000 (10:52 +0200)

Trivial merge