From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 7 Mar 2012 09:43:31 +0000 (+0100)
Subject: Merge branch 'divVerent/augenkrebs' of git://de.git.xonotic.org/xonotic/xonotic-maps... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b790509e426a2037f63453e511d70bb5156611d1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'divVerent/augenkrebs' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into divVerent/augenkrebs
---

b790509e426a2037f63453e511d70bb5156611d1