From: Samual <samual@xonotic.org>
Date: Tue, 16 Aug 2011 19:19:40 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/menu_updates
X-Git-Tag: xonotic-v0.6.0~190
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58e995eeeec1b4c657b1204963d050e56760160d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/menu_updates
---

58e995eeeec1b4c657b1204963d050e56760160d