From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 24 Aug 2015 05:41:25 +0000 (+0000)
Subject: Merge branch 'TimePath/itemstime2.0' into 'master'
X-Git-Tag: xonotic-v0.8.2~2042
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c05a52d04d7441d637b2e5b93f3e480c23f55e28;p=xonotic%2Fxonotic-data.pk3dir.git

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

Itemstime improvements

Also fixes #1521

See merge request !200
---

c05a52d04d7441d637b2e5b93f3e480c23f55e28