From: cbrutail <ruszkai.akos@gmail.com>
Date: Sun, 16 Jan 2011 23:43:46 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5859ef379da6696bd9346841678e7a6cd4188318;p=xonotic%2Fxonotic-maps.pk3dir.git

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

5859ef379da6696bd9346841678e7a6cd4188318