From: Samual Lenks <samual@xonotic.org>
Date: Wed, 8 May 2013 04:31:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/lms_fixes'
X-Git-Tag: xonotic-v0.7.0~55^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=543beff6240a5ef6197c018fa3b1cc9120c6c44e;p=xonotic%2Fxonotic-data.pk3dir.git

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

543beff6240a5ef6197c018fa3b1cc9120c6c44e