From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Sep 2010 19:20:04 +0000 (+0200)
Subject: Merge commit 'c87167c'
X-Git-Tag: xonotic-v0.1.0preview~141
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=447c18af7f96b9fa0ca43165b48d5930fcf2f561;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge commit 'c87167c'
---

447c18af7f96b9fa0ca43165b48d5930fcf2f561