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

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

79ae51ca99fcbf22f4e861ca1893aa0b12a52109