From: Samual <samual@xonotic.org>
Date: Wed, 26 Oct 2011 01:00:39 +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~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a583d34d6bce12e570e169b3c7e364638160b8f;p=xonotic%2Fxonotic-data.pk3dir.git

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

7a583d34d6bce12e570e169b3c7e364638160b8f