From: Samual Lenks <samual@xonotic.org>
Date: Sat, 11 May 2013 21:47:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/extralife_fix'
X-Git-Tag: xonotic-v0.7.0~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f600c870d8c86806c33c99a8ae35f796bfc5de66;p=xonotic%2Fxonotic-data.pk3dir.git

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

f600c870d8c86806c33c99a8ae35f796bfc5de66