From: Samual <samual@xonotic.org>
Date: Tue, 18 Oct 2011 20:45:48 +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~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0885e3da8d333a38db3e6e3dc316568208e1bdc8;p=xonotic%2Fxonotic-data.pk3dir.git

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

0885e3da8d333a38db3e6e3dc316568208e1bdc8