From: Samual <samual@xonotic.org>
Date: Sat, 24 Sep 2011 18:56:30 +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~68
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e783c0e775ae3068e6f4c1b2fa7620d38d918f3e

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

e783c0e775ae3068e6f4c1b2fa7620d38d918f3e