From: mand1nga <mand1nga@xonotic.org>
Date: Thu, 1 Sep 2011 02:56:17 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/samual/fix_welcome_message'
X-Git-Tag: xonotic-v0.5.0~14^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b8dc96e1ab7c083a2d6fc012d668005c41db13b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/fix_welcome_message'
---

4b8dc96e1ab7c083a2d6fc012d668005c41db13b