From: cbrutail <ruszkai.akos@gmail.com>
Date: Fri, 30 Dec 2011 19:57:24 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=012d8eb0bd680a864eb10858b3e6ada807470514;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/darkzone
---

012d8eb0bd680a864eb10858b3e6ada807470514