From: Mario <zacjardine@y7mail.com>
Date: Fri, 10 Mar 2017 17:37:24 +0000 (+0000)
Subject: Merge branch 'Mario/itemstime_editor_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~98
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cd60b2d7d720d0ccc580eecd3abf2a4768092aba

Merge branch 'Mario/itemstime_editor_fix' into 'master'

Merge branch Mario/itemstime_editor_fix (S merge request)

See merge request !415
---

cd60b2d7d720d0ccc580eecd3abf2a4768092aba