From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 13 May 2012 09:08:54 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/player_cubemaps
X-Git-Tag: xonotic-v0.8.0~89^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81a396973d3038c88815d4dfa4b871b39056467b;p=xonotic%2Fxonotic-data.pk3dir.git

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

81a396973d3038c88815d4dfa4b871b39056467b