Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
authorSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000 (19:30 +0200)
committerSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000 (19:30 +0200)
commit8f7dc42f2f0e75137fa2a98c63b1a889dd2efe22
tree70457beb72261c253bdc582156ce7cee4204562f
parentab6e13f1c55a8487430f62b10c84c82c2626d313
parentb2f2ba427705f90379bf1b3768721792bd7eab55
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3