From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 03:27:46 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~45
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8f8c153ded2fc16282faf86ec673b3d44120801c

Merge branch 'master' into Mario/weapons_new

Conflicts:
	qcsrc/client/scoreboard.qc
	qcsrc/server/w_minstanex.qc
---

8f8c153ded2fc16282faf86ec673b3d44120801c