From: Samual Lenks <samual@xonotic.org>
Date: Tue, 7 May 2013 05:38:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/lms_updates'
X-Git-Tag: xonotic-v0.7.0~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7094e1bf39336183150e9da00f9d3e2d7d0b664b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/lms_updates'
---

7094e1bf39336183150e9da00f9d3e2d7d0b664b