From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 15:56:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
X-Git-Tag: xonotic-v0.7.0~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd51eaf1bdd429d7f75a801f217e36b093a123ea;p=xonotic%2Fxonotic-maps.pk3dir.git

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

dd51eaf1bdd429d7f75a801f217e36b093a123ea