Merge remote-tracking branch 'origin/debugger/superspec_options'
authorSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:14:12 +0000 (23:14 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:14:12 +0000 (23:14 -0400)

Trivial merge