Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban... 95/head
authorMattia Basaglia <mattia.basaglia@gmail.com>
Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)

Trivial merge