From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 26 Dec 2016 03:42:43 +0000 (+1100)
Subject: Merge branch 'TimePath/inventory_tweaks'
X-Git-Tag: xonotic-v0.8.2~352
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=238697513c0d8799ad5c619c94dc79a34b063d24;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/inventory_tweaks'
---

238697513c0d8799ad5c619c94dc79a34b063d24