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

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

d803cb8705fe8a3c38c644da9ae25ae45fb41151