From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 05:44:23 +0000 (+1100)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7a45adcb6d442c2a1259d8900cbb16d7858e090;p=xonotic%2Fxonotic-maps.pk3dir.git

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

b7a45adcb6d442c2a1259d8900cbb16d7858e090