From: Mario <mario.mario@y7mail.com>
Date: Tue, 25 Nov 2014 06:34:47 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/nyov/remove-playermodeltokens'
X-Git-Tag: xonotic-v0.8.0~142
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=af818d85ab5246b8ecd1743ecf808d39e4396445

Merge remote-tracking branch 'origin/nyov/remove-playermodeltokens'
---

af818d85ab5246b8ecd1743ecf808d39e4396445