From: terencehill <piuntn@gmail.com>
Date: Tue, 24 May 2011 22:34:29 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/essential_weapons_panel
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9533251c17521a8446265c8924ec3e68f1232690;p=xonotic%2Fxonotic-data.pk3dir.git

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

9533251c17521a8446265c8924ec3e68f1232690