Merge remote-tracking branch 'origin/DefaultUser/damagetext_friendlyfire'
authorMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:12:12 +0000 (09:12 +1000)
committerMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:12:52 +0000 (09:12 +1000)

Trivial merge