From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 2 Sep 2011 05:44:29 +0000 (+0200)
Subject: Merge remote branch 'origin/samual/quick_menu_updates'
X-Git-Tag: xonotic-v0.5.0~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa22caddcdf738a822a86d5a7ed690e304b89ec5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/quick_menu_updates'
---

aa22caddcdf738a822a86d5a7ed690e304b89ec5