From: terencehill <piuntn@gmail.com>
Date: Wed, 13 Jul 2011 20:30:13 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/essential_weapons_panel
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc3538ad5afba59f36a79011ec6997553c851c25;p=xonotic%2Fxonotic-data.pk3dir.git

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

dc3538ad5afba59f36a79011ec6997553c851c25