From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 6 Oct 2013 15:16:41 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_terminus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b75a09e3a1f29947b096ea8f8b11a46c4aa2f454;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/playermodel_terminus
---

b75a09e3a1f29947b096ea8f8b11a46c4aa2f454