From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 3 Apr 2011 22:33:29 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=221e7246ee2f3fa931f74708d9c04a8dfc22177e;p=xonotic%2Fxonotic-data.pk3dir.git

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

221e7246ee2f3fa931f74708d9c04a8dfc22177e