From: Samual Lenks Date: Mon, 22 Apr 2013 20:25:55 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix X-Git-Tag: xonotic-v0.7.0~73^2^2 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=6b188d663fd973615bd71b58cfd2d7b1b2df0ca9;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix --- 6b188d663fd973615bd71b58cfd2d7b1b2df0ca9