From: terencehill <piuntn@gmail.com>
Date: Thu, 5 Jul 2012 19:56:11 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/directmenu_options
X-Git-Tag: xonotic-v0.7.0~193^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6b84d3c61943e06b72eed9bf0b1ad73e58ff670;p=xonotic%2Fxonotic-data.pk3dir.git

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

e6b84d3c61943e06b72eed9bf0b1ad73e58ff670