From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 30 Dec 2011 17:59:22 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
X-Git-Tag: xonotic-v0.6.0~36^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=254ba7337e17f8a0e669185948ae3c5debe70c9d

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

Conflicts:
	maps/g-23.map
---

254ba7337e17f8a0e669185948ae3c5debe70c9d