From: Samual <samual@xonotic.org>
Date: Tue, 27 Sep 2011 03:19:46 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into terencehill/menu_tooltips_2
X-Git-Tag: xonotic-v0.6.0~40^2~108^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72d3dea2617743a60d67fe3b87e4a71a3557bc3a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into terencehill/menu_tooltips_2
---

72d3dea2617743a60d67fe3b87e4a71a3557bc3a