From: cbrutail <ruszkai.akos@gmail.com>
Date: Fri, 19 Apr 2013 21:31:48 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-fanatic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcbrutail%2Fmap-fanatic;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-fanatic

MErging master, also uploading again (?)
---

8141099ed9eeecaeb0b0c29f354caa5960f775f0