From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 10 Sep 2012 13:36:58 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/player_cubemaps
X-Git-Tag: xonotic-v0.8.0~89^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be2428a92a8c3f81efabad5e066cbf68fc9d611c;p=xonotic%2Fxonotic-data.pk3dir.git

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

be2428a92a8c3f81efabad5e066cbf68fc9d611c