From: cbrutail <ruszkai.akos@gmail.com>
Date: Sat, 11 Feb 2012 20:53:46 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e57f270175acf5328a9fe3173e8eae350e421b4;p=xonotic%2Fxonotic-maps.pk3dir.git

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

6e57f270175acf5328a9fe3173e8eae350e421b4