Merge branch 'Mario/legacy_gametypenames'
authorMario <zacjardine@y7mail.com>
Sun, 16 Nov 2014 12:20:35 +0000 (23:20 +1100)
committerMario <zacjardine@y7mail.com>
Sun, 16 Nov 2014 12:20:35 +0000 (23:20 +1100)
commit99a15ec6d46a049ac04446c17ad407551dd500e1
tree0ab8cad333ef02bcd4c599ed8cdab3e3dae8ac4f
parent78a55a99d175a6b2ae5007bc2fa056dbbc3d3cf5
parent6c2ebdaf6d948cefa22185dcb67923f1fda2a807
Merge branch 'Mario/legacy_gametypenames'