From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 00:37:12 +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~66
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e88afc4a32e707b82c1515c5a6948a93f4cfde5;p=xonotic%2Fxonotic-data.pk3dir.git

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

9e88afc4a32e707b82c1515c5a6948a93f4cfde5