From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 22:27:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/zykure/teamscores'
X-Git-Tag: xonotic-v0.7.0~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6baaca28bc15a710c5dc79feb64685356048592b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/zykure/teamscores'
---

6baaca28bc15a710c5dc79feb64685356048592b