From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 21 Mar 2012 16:55:16 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=555563e13c3357474a18f334bc2cb7e95509dde0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-fanatic
---

555563e13c3357474a18f334bc2cb7e95509dde0