Merge branch 'TimePath/gamemode_composition' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 24 Oct 2015 10:01:23 +0000 (10:01 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 24 Oct 2015 10:01:23 +0000 (10:01 +0000)
commit0141e404f85cd34e2394beb4c8651566cc291063
tree58529374705f75cc887e166c2852059a59857c1b
parentc561750c522a94122172d1daeaaded23f2d945ae
parent5bbfb59ff40eca7824c231d687c2bf587a01749d
Merge branch 'TimePath/gamemode_composition' into 'master'

Gamemode composition part 1

For #1573

See merge request !244