Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/simpleitems'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:33:18 +0000 (13:33 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:33:18 +0000 (13:33 +1100)

Trivial merge