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

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

6bbfa0087511c512147fff7bc8670720ce19b3cd