From: Samual Lenks Date: Sat, 28 Dec 2013 19:00:11 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha X-Git-Tag: xonotic-v0.8.0~249^2~3 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=df2cf141547e4df971d310e2e09bbf1e8d008963;hp=-c Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha --- df2cf141547e4df971d310e2e09bbf1e8d008963