From: Mario <zacjardine@y7mail.com>
Date: Sat, 14 Feb 2015 13:02:54 +0000 (+1100)
Subject: Merge branch 'master' into sev/weapon_panel_retry
X-Git-Tag: xonotic-v0.8.1~117^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=152e0bc83b3c2267302078eb38917d225e11fe39;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into sev/weapon_panel_retry
---

152e0bc83b3c2267302078eb38917d225e11fe39