From: Mario <mario.mario@y7mail.com>
Date: Tue, 1 Oct 2013 16:11:24 +0000 (-0700)
Subject: Merge branch 'master' into Mario/quickmenu_merge
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffc3e200059f0ad92a5b2127f68837bf27afd956;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/quickmenu_merge
---

ffc3e200059f0ad92a5b2127f68837bf27afd956