From: Mario <mario.mario@y7mail.com>
Date: Sat, 21 Nov 2015 08:18:30 +0000 (+1000)
Subject: Merge branch 'Melanosuchus/minigames'
X-Git-Tag: xonotic-v0.8.2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0da1824a3b5784511fe88b02e5a6717dd3c9e265;p=xonotic%2Fmediasource.git

Merge branch 'Melanosuchus/minigames'
---

0da1824a3b5784511fe88b02e5a6717dd3c9e265