From: Mario <zacjardine@y7mail.com>
Date: Sun, 2 Aug 2015 02:53:02 +0000 (+1000)
Subject: Merge branch 'master' into sev/luma_hud_vehicles
X-Git-Tag: xonotic-v0.8.1~31^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9b16a719396d1afe1a767dd35e8cc5de779a22d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into sev/luma_hud_vehicles

# Conflicts:
#	qcsrc/client/view.qc
---

d9b16a719396d1afe1a767dd35e8cc5de779a22d