From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 26 Aug 2015 12:15:03 +0000 (+0000)
Subject: Merge branch 'TimePath/itemstime2.0_regressions' into 'master'
X-Git-Tag: xonotic-v0.8.2~2028
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=f33c851ada6cb8957ea5a59ff96171bedd83adbb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/itemstime2.0_regressions' into 'master'

Itemstime2.0 regressions

Closes #1526

See merge request !204
---

f33c851ada6cb8957ea5a59ff96171bedd83adbb