From: Samual Lenks <samual@xonotic.org>
Date: Wed, 12 Dec 2012 21:59:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/directmenu_options'
X-Git-Tag: xonotic-v0.7.0~193
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7de32704d7b8cfffdd701e143de8672d018e16e2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/directmenu_options'
---

7de32704d7b8cfffdd701e143de8672d018e16e2