From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 3 Jul 2012 10:19:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/morphed/pillar' into tzork/map-topoftheworld
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c15a2fa9975971286f7c11d392a8b30ac0c367fc;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/morphed/pillar' into tzork/map-topoftheworld
---

c15a2fa9975971286f7c11d392a8b30ac0c367fc