From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 28 Oct 2011 12:22:43 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/sandbox
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~87
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89eff022dd8653e6b5965d35dd9fb9caa54fe72c;p=xonotic%2Fxonotic-data.pk3dir.git

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

89eff022dd8653e6b5965d35dd9fb9caa54fe72c