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

Trivial merge