From: Rudolf Polzer Date: Fri, 22 Oct 2010 20:50:23 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/glowplant' X-Git-Tag: xonotic-v0.1.0preview~74 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=966b4f9d990604e38b7a2b936472062168f2923c;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote branch 'refs/remotes/origin/fruitiex/glowplant' --- 966b4f9d990604e38b7a2b936472062168f2923c