From: Samual Lenks <samual@xonotic.org>
Date: Tue, 4 Jun 2013 20:00:07 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/extralives_fix'
X-Git-Tag: xonotic-v0.7.0~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a658d3bc570560b6562560642267ef3d0125e34b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/extralives_fix'
---

a658d3bc570560b6562560642267ef3d0125e34b