From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 15 Nov 2011 11:03:26 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/sandbox
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2976326817cdd461dcfa0fdbcb58d3413687451b;p=xonotic%2Fxonotic-data.pk3dir.git

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

2976326817cdd461dcfa0fdbcb58d3413687451b