From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 22 Jun 2011 15:23:31 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e72403e8a4a49b1f0c6f1268ac59575d479d4a64;p=xonotic%2Fxonotic-maps.pk3dir.git

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

e72403e8a4a49b1f0c6f1268ac59575d479d4a64