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

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

22816d832549f36100395c5ee90c9da831e4f421