From: Samual <samual@xonotic.org>
Date: Mon, 17 Oct 2011 04:10:41 +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~41
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6a2b676c018274497d5228f8ddff3ef8a7f833ad;p=xonotic%2Fxonotic-data.pk3dir.git

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

6a2b676c018274497d5228f8ddff3ef8a7f833ad