From: Samual Lenks <samual@xonotic.org>
Date: Sat, 1 Jun 2013 19:47:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/zykure/teamscores'
X-Git-Tag: xonotic-v0.7.0~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef7fb74ce9ad83994863a75b8ffd338cad29d68d;p=xonotic%2Fxonotic-data.pk3dir.git

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

ef7fb74ce9ad83994863a75b8ffd338cad29d68d