From: Samual Lenks <samual@xonotic.org>
Date: Mon, 3 Jun 2013 17:22:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/glowplant'
X-Git-Tag: xonotic-v0.7.0~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=35c43f6f7bbfcc21faa4b5035d577c88e931d942;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/glowplant'
---

35c43f6f7bbfcc21faa4b5035d577c88e931d942