From: Mario <zacjardine@y7mail.com>
Date: Sun, 16 Nov 2014 11:45:25 +0000 (+1100)
Subject: Merge branch 'nyov/remove-playermodeltokens'
X-Git-Tag: xonotic-v0.8.0~145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78a55a99d175a6b2ae5007bc2fa056dbbc3d3cf5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'nyov/remove-playermodeltokens'
---

78a55a99d175a6b2ae5007bc2fa056dbbc3d3cf5