From: Mario <zacjardine@y7mail.com>
Date: Mon, 9 Feb 2015 15:05:36 +0000 (+1100)
Subject: Merge branch 'master' into tzork/map-dotc_test4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc495ae485892823cd17568981ceeab82501012a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into tzork/map-dotc_test4
---

bc495ae485892823cd17568981ceeab82501012a