From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 29 Dec 2011 16:02:49 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
X-Git-Tag: xonotic-v0.6.0~36^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7cb5e73aed101f67f8471bce850b19dea1c76193;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
---

7cb5e73aed101f67f8471bce850b19dea1c76193