From: Samual <samual@xonotic.org>
Date: Mon, 17 Oct 2011 19:09:45 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/hud_updates
X-Git-Tag: xonotic-v0.6.0~35^2~78^2~7^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37ff2a84b803701be464173fb557c80b2cf60f46;p=xonotic%2Fxonotic-data.pk3dir.git

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

37ff2a84b803701be464173fb557c80b2cf60f46