Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
authorMirio <opivy@hotmail.de>
Mon, 27 Jul 2015 16:29:21 +0000 (18:29 +0200)
committerMirio <opivy@hotmail.de>
Mon, 27 Jul 2015 16:29:21 +0000 (18:29 +0200)

Trivial merge