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

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

feb970c673ec3117321754fad37a6552c28ab582