From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:27:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/debugger/glowplant'
X-Git-Tag: xonotic-v0.7.0~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0211b5231dbac69da68a66e8f6b49dd6af6cbb6;p=xonotic%2Fxonotic-maps.pk3dir.git

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

b0211b5231dbac69da68a66e8f6b49dd6af6cbb6