From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 15:58:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/debugger/glowplant'
X-Git-Tag: xonotic-v0.7.0~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5916ec3055610d8cf07f27ee74999083416b73b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

a5916ec3055610d8cf07f27ee74999083416b73b