Merge remote-tracking branch 'origin/Mario/extralife_fix'
authorSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 21:47:38 +0000 (17:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 21:47:38 +0000 (17:47 -0400)
1  2 
qcsrc/server/t_items.qc

Simple merge