From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 13 Jan 2011 06:06:53 +0000 (+0100)
Subject: Merge remote branch 'origin/sev/menuadjustments'
X-Git-Tag: xonotic-v0.5.0~318^2~128
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52760f9ff9174fa2c917636ebafcd74077485dec;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/sev/menuadjustments'
---

52760f9ff9174fa2c917636ebafcd74077485dec