From: Mario Date: Mon, 19 Jan 2015 08:01:29 +0000 (+1100) Subject: Merge remote-tracking branch 'origin/master' into sev/luma X-Git-Tag: xonotic-v0.8.1~144^2~5 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=22c9ec191659865b01087057878ca561e4cbbcec Merge remote-tracking branch 'origin/master' into sev/luma --- 22c9ec191659865b01087057878ca561e4cbbcec