Merge remote-tracking branch 'origin/debugger/courtfun'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:27:26 +0000 (23:27 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:27:26 +0000 (23:27 -0400)

Trivial merge