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)
commit7c512f1e1e6dce4675507a5d1de02784d99e508c
treed8fbada7c9a6f98f70d9ed72e7bfa28683ad2fac
parent61b0a7b4c78ce8a822fd65b1657bddb8ab815caa
parentbeca805c1bf521d62b3099b0d0498eda57f03501
Merge remote-tracking branch 'origin/samual/lsmaps_update'