From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 00:06:40 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into kuniuthefrogg/attic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fkuniuthefrogg%2Fattic;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into kuniuthefrogg/attic
---

5b3c5a2a1de20ff1dc50e1a4023a7fe14aa00439