From: Rudolf Polzer Date: Wed, 19 Oct 2016 19:43:42 +0000 (-0400) Subject: Merge branch 'master' into cbrutail/function2012 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53bb6b8177fdcd672f5527774b6f28516d0b9efa;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/function2012 --- 53bb6b8177fdcd672f5527774b6f28516d0b9efa