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)
commit76fc4a57414acf55e252fd3d44a28a9c6f79aa50
tree0f00346c5be4e25425162f06aa29ff249fc7e18b
parent5310c50bac3297a0f8f21db55e8095921f61c656
parentfcd8d260f9af94de42fa3daac5cca542efd4051e
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/kickban-unconnected