From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 13 Jan 2011 15:46:10 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb5a1bcc4731e420a3be24881d1d93b6d146d4c8;p=xonotic%2Fxonotic-data.pk3dir.git

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

cb5a1bcc4731e420a3be24881d1d93b6d146d4c8