From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 21 Mar 2015 22:14:20 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/workarea
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FdivVerent%2Fworkarea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/workarea
---

7ec33d9f5cf5ab6dc7c7aa7ac215f98f80ff0ce2