From: Rudolf Polzer Date: Thu, 13 Jan 2011 06:10:47 +0000 (+0100) Subject: Merge remote branch 'origin/terencehill/serverlist_fix' X-Git-Tag: xonotic-v0.5.0~318^2~126 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81e0e6d9c8fa5f317f86e11781201b40a3015d33;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/terencehill/serverlist_fix' --- 81e0e6d9c8fa5f317f86e11781201b40a3015d33