From: Samual Lenks <samual@xonotic.org>
Date: Mon, 3 Jun 2013 17:20:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/drain'
X-Git-Tag: xonotic-v0.7.0~11
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=c36d8743da510415e9eec98c915d25a3e9a52e83;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/drain'
---

c36d8743da510415e9eec98c915d25a3e9a52e83