Merge remote-tracking branch 'origin/Mario/lms_fixes'
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)
commit543beff6240a5ef6197c018fa3b1cc9120c6c44e
tree230315d692ed030fcb1d6c6e0818b79eefd4eec4
parentc0f6855704ff5936e6eb0b2328f7bb1ca66b60e5
parentff949c70b545db358159063980b2a787c43ae238
Merge remote-tracking branch 'origin/Mario/lms_fixes'