From: Samual Lenks <samual@xonotic.org>
Date: Sun, 25 Aug 2013 22:51:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/lsmaps_update'
X-Git-Tag: xonotic-v0.8.0~357
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c512f1e1e6dce4675507a5d1de02784d99e508c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/lsmaps_update'
---

7c512f1e1e6dce4675507a5d1de02784d99e508c