From: Samual <samual@xonotic.org>
Date: Mon, 24 Oct 2011 03:34:19 +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~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6c299cb1afbff219ff1d7dc737ec1a75a277f8f;p=xonotic%2Fxonotic-data.pk3dir.git

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

d6c299cb1afbff219ff1d7dc737ec1a75a277f8f