From: Samual <samual@xonotic.org>
Date: Thu, 20 Oct 2011 06:06:06 +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~15
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=74e6f7b9c00bc17d93633557706d9189d363dd56;p=xonotic%2Fxonotic-data.pk3dir.git

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

74e6f7b9c00bc17d93633557706d9189d363dd56