From: Mario <mario.mario@y7mail.com>
Date: Thu, 27 Nov 2014 03:56:36 +0000 (+1100)
Subject: Merge branch 'Mirio/drain'
X-Git-Tag: xonotic-v0.8.0~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c9cdc668ab3faaf1f079664185768175483ba7a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/drain'
---

4c9cdc668ab3faaf1f079664185768175483ba7a