Merge remote-tracking branch 'origin/matthiaskrgr/map_descs'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:28:56 +0000 (12:28 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:28:56 +0000 (12:28 -0400)
commit4844eea689a930608c31e7da2057e9e71ef31a7b
tree06b5e9ec3aeb5f183cdacb77dfe6a8bc2d46c005
parent140c957c7451ae4dc5065e06dbf87a2ce61a9a6d
parent7b02aaeced3584f1438cfba8371d9530ea3f9c1d
Merge remote-tracking branch 'origin/matthiaskrgr/map_descs'