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

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

d3dd60b4ab7b66105190d5572ebd248c95fc04b0