From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:48:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
X-Git-Tag: xonotic-v0.7.0~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a1d08fac15a517d545a13587aa225e2ef9379bb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
---

7a1d08fac15a517d545a13587aa225e2ef9379bb