From: terencehill <piuntn@gmail.com>
Date: Sun, 1 Feb 2015 13:09:39 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/weapon_panel_fix
X-Git-Tag: xonotic-v0.8.1~129^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4bb0136f4b56175ad129c21c7f0cdde834cf0773;p=xonotic%2Fxonotic-data.pk3dir.git

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

4bb0136f4b56175ad129c21c7f0cdde834cf0773