From: Mario <zacjardine@y7mail.com>
Date: Fri, 13 Mar 2015 11:13:45 +0000 (+1100)
Subject: Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3728996a83b7c8d48efccdce4cf1d0632e324aae;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
---

3728996a83b7c8d48efccdce4cf1d0632e324aae