From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 29 Oct 2015 08:19:33 +0000 (+0000)
Subject: Merge branch 'TimePath/items' into 'master'
X-Git-Tag: xonotic-v0.8.2~1760
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f93bcb5dd8686abd0b407df953ad211f3265eb91;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/items' into 'master'

Cleanup item pickups (M merge request)



See merge request !245
---

f93bcb5dd8686abd0b407df953ad211f3265eb91