Omega via svn r10237:
apply changes to combattimer too
Omega via svn r10238:
fix a spoils bug
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
Fix