From: Mario <zacjardine@y7mail.com>
Date: Sun, 15 Nov 2015 22:53:01 +0000 (+0000)
Subject: Merge branch 'terencehill/g_lms_extra_lives' into 'master'
X-Git-Tag: xonotic-v0.8.2~1656
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1385b1eb134e4c40239273511fd63b97ff51815;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/g_lms_extra_lives' into 'master'

Extralife for g_lms_extra_lives



See merge request !252
---

c1385b1eb134e4c40239273511fd63b97ff51815