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

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

9c4f14b8fe9673393d02749d86d2da245cb02e25