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

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

3f8fde1b64a2f6dea5bcac5373010d00f66bce37