Merge remote-tracking branch 'origin/Mirio/drain'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:20:37 +0000 (13:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:20:37 +0000 (13:20 -0400)

Trivial merge