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

Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into Mario/quickmenu_merge
---

24b3e74d336b3a9f889f384a9cf05e9dee4232a1