From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 18 Jun 2010 12:31:36 +0000 (+0200)
Subject: Merge remote branch 'origin/morphed/mapstuff'
X-Git-Tag: xonotic-v0.1.0preview~168
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c25616d9a388a63faaefcbc7d23439d3f639c9de;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/morphed/mapstuff'
---

c25616d9a388a63faaefcbc7d23439d3f639c9de