Merge remote-tracking branch 'origin/samual/lsmaps_update'
authorSamual Lenks <samual@xonotic.org>
Sun, 25 Aug 2013 22:51:28 +0000 (18:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 25 Aug 2013 22:51:28 +0000 (18:51 -0400)

Trivial merge