Merge remote-tracking branch 'origin/debugger/solarium'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:53:01 +0000 (00:53 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:53:01 +0000 (00:53 -0400)

Trivial merge