From: Mario <zacjardine@y7mail.com>
Date: Fri, 23 Jan 2015 23:15:42 +0000 (+1100)
Subject: Merge branch 'master' into Mario/spacebase
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Fspacebase;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mario/spacebase
---

1a382ff86f2ae3fcc75c4c47a6e8a04d5571dade