From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 4 Jan 2012 18:34:28 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42e4226c80f94ab10e83eeca1038a279e5ab2b7d;p=xonotic%2Fxonotic-maps.pk3dir.git

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

42e4226c80f94ab10e83eeca1038a279e5ab2b7d