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

Merge branch 'master' into Mirio/drain
---

f345f94923129fb070025ac04ec4e16cd55978b3