From: Mario <zacjardine@y7mail.com>
Date: Fri, 23 Jan 2015 23:18:48 +0000 (+1100)
Subject: Merge branch 'master' into tzork/map-dotc_test4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=120d95414997fd19cfbfd3a4061dde3cb8a8fabc;p=xonotic%2Fxonotic-maps.pk3dir.git

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

120d95414997fd19cfbfd3a4061dde3cb8a8fabc