From: Mario <zacjardine@y7mail.com>
Date: Wed, 4 Mar 2015 09:42:53 +0000 (+1100)
Subject: Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28be33b3970f98eab4109a5da6b51672e874b9bd;p=xonotic%2Fxonotic-data.pk3dir.git

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

28be33b3970f98eab4109a5da6b51672e874b9bd