Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuch...
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 31 Jan 2015 21:34:46 +0000 (22:34 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 31 Jan 2015 21:34:46 +0000 (22:34 +0100)

Trivial merge