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

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

1846e8f66dba1522a83fec1b79c02f1c0da570d6