From: Mario <zacjardine@y7mail.com>
Date: Sat, 7 Feb 2015 08:54:45 +0000 (+0000)
Subject: Merge branch 'TimePath/issues/1454' into 'master'
X-Git-Tag: xonotic-v0.8.1~124
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ca408d8108b9882e4b81b5eca1a43c7d3e308d6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/issues/1454' into 'master'

Menu VM crash when g_invasion is set to 1

See merge request !109
---

7ca408d8108b9882e4b81b5eca1a43c7d3e308d6