From: cbrutail <ruszkai.akos@gmail.com>
Date: Fri, 30 Dec 2011 14:33:32 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
X-Git-Tag: xonotic-v0.6.0~36^2~3
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=39922611b3dcbd1a6cee3dfa52689d551ca41733;p=xonotic%2Fxonotic-maps.pk3dir.git

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

39922611b3dcbd1a6cee3dfa52689d551ca41733