Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
authorSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000 (19:30 +0200)
committerSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000 (19:30 +0200)

Trivial merge