From: Mario <zacjardine@y7mail.com>
Date: Sun, 14 Dec 2014 11:38:28 +0000 (+0000)
Subject: Merge branch 'TimePath/combined_updates' into 'master'
X-Git-Tag: xonotic-v0.8.0~86
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6eb6e7fc36a3a243c5171b8cc3db88e823514d4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/combined_updates' into 'master'

TimePath/combined_updates

samual/combined_updates without the bad merge with nyov's effects changes

See merge request !50
---

e6eb6e7fc36a3a243c5171b8cc3db88e823514d4