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

Merge remote-tracking branch 'origin/Mirio/g-23'
---

49d7a5ddecef82bf7d80738bb3c1599f09d0936b