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

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

d63698141ce3137037a9ef65b03d053a60a80ea2