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)
commit5310c50bac3297a0f8f21db55e8095921f61c656
tree6d98b22ed2af629edb7927a28ae12497ecc2eccd
parentf7b39d76944d944eaa3df6566fc9e0d236c005e5
parent3cccadd3f93d6d5fc75a8d8aef8249f97bd83d0d
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban-unconnected-v2