From: Mario Date: Sat, 11 Jul 2015 13:27:59 +0000 (+1000) Subject: Merge branch 'master' into debugger/shadow/atelier X-Git-Tag: xonotic-v0.8.1~9^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e4de153b6f4d57c85954c9e5c32f8869b5b349e2;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into debugger/shadow/atelier --- e4de153b6f4d57c85954c9e5c32f8869b5b349e2