From: Samual <samual@xonotic.org>
Date: Mon, 12 Sep 2011 06:37:32 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=db3d8b68f0aff3f1304428e9d60836b4a8013a5a

Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
---

db3d8b68f0aff3f1304428e9d60836b4a8013a5a