From: Samual <samual@xonotic.org>
Date: Sat, 15 Oct 2011 18:35:47 +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~51
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=c1c880cbb7ea0d86739e14d5d997480ba73024c7;p=xonotic%2Fxonotic-data.pk3dir.git

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

c1c880cbb7ea0d86739e14d5d997480ba73024c7