Merge remote-tracking branch 'origin/Mario/lms_updates'
authorSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:38:52 +0000 (01:38 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:38:52 +0000 (01:38 -0400)

Trivial merge