From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Oct 2015 10:01:23 +0000 (+0000)
Subject: Merge branch 'TimePath/gamemode_composition' into 'master'
X-Git-Tag: xonotic-v0.8.2~1801
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0141e404f85cd34e2394beb4c8651566cc291063

Merge branch 'TimePath/gamemode_composition' into 'master'

Gamemode composition part 1

For #1573

See merge request !244
---

0141e404f85cd34e2394beb4c8651566cc291063