From: Samual <samual@xonotic.org>
Date: Sun, 23 Oct 2011 03:50:55 +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~13
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=9a41842c89f620a0cae9e11dc33aa70cc9dd8e72;p=xonotic%2Fxonotic-data.pk3dir.git

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

9a41842c89f620a0cae9e11dc33aa70cc9dd8e72