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

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

b4aa221c18c92b95d8f54d338679ddd25c0b1eb2