From: Mario Date: Sat, 24 Jan 2015 00:11:40 +0000 (+1100) Subject: Merge remote-tracking branch 'origin/master' into debugger/shadow/atelier X-Git-Tag: xonotic-v0.8.1~9^2~22 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a45ae658dcf4fd512f581cae6fd433091c7b937c;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/master' into debugger/shadow/atelier --- a45ae658dcf4fd512f581cae6fd433091c7b937c