From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Dec 2014 01:57:53 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/combined_updates
X-Git-Tag: xonotic-v0.8.0~86^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc25d591f448c6ed191fcf9452d65b87d7a26e90;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/combined_updates

Conflicts:
	qcsrc/common/notifications.qh
---

dc25d591f448c6ed191fcf9452d65b87d7a26e90