From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 18 Jan 2014 14:35:28 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/shalom8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FdivVerent%2Fshalom8;p=xonotic%2Fxonotic-maps.pk3dir.git

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

aaa6b6d3c345c337ff2dd0964cf4d06b416724c8