From: Samual <samual@xonotic.org>
Date: Sat, 1 Oct 2011 05:59:27 +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~64
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d87a53695d97a6586a3356b5eb7acb4ca5c3bdd9;p=xonotic%2Fxonotic-data.pk3dir.git

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

d87a53695d97a6586a3356b5eb7acb4ca5c3bdd9