From: Mirio <opivy@hotmail.de>
Date: Tue, 17 Jun 2014 12:38:57 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into... 
X-Git-Tag: xonotic-v0.8.1~27^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbd1569b4737e041e29a811be213e964112df88e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/glowplant
---

bbd1569b4737e041e29a811be213e964112df88e