From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 00:12:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into debugger/minigrudge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b4be6bf2136bd14ac0c2d84822e799a74c0043d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into debugger/minigrudge
---

1b4be6bf2136bd14ac0c2d84822e799a74c0043d