From: Samual <samual@xonotic.org>
Date: Mon, 29 Aug 2011 07:16:36 +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~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2547369acbe9fc29dd9101a6d93f3a2056ef7368;p=xonotic%2Fxonotic-data.pk3dir.git

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

2547369acbe9fc29dd9101a6d93f3a2056ef7368