Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:56:16 +0000 (11:56 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:56:16 +0000 (11:56 -0400)

Trivial merge