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)

Trivial merge