From: Samual Lenks <samual@xonotic.org>
Date: Thu, 27 Dec 2012 14:10:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~319
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f90110cc3ea63d06689743e2aa8fc144d9b9b18;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
	qcsrc/server/g_damage.qc
---

8f90110cc3ea63d06689743e2aa8fc144d9b9b18