From: terencehill <piuntn@gmail.com>
Date: Wed, 13 Jun 2012 12:26:12 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/directmenu_options
X-Git-Tag: xonotic-v0.7.0~193^2~2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=14d52331c099f8ad672f5ab28ada4dc50243230c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/directmenu_options
---

14d52331c099f8ad672f5ab28ada4dc50243230c