From: cbrutail <ruszkai.akos@gmail.com>
Date: Sun, 11 Mar 2012 10:29:03 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c7ecb484a4cc1b7f219b57cd57688da2c1df33c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

0c7ecb484a4cc1b7f219b57cd57688da2c1df33c