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

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

1278a0e7c7db6991679073c5aad7d6f5da5589ce