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

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

44c4ffc7caf6627ee75d103e9c260c734dc360cd