Omega via svn r9437:
fix dark parasite bug
Omega via svn r9438:
fix some errors
Omega via svn r9439:
prettier ice wall icon
Omega via svn r9440:
quick push of icon stuff, will fix it up after pulls
Omega via svn r9441:
option text
Omega via svn r9442:
fix some errors
Omega via svn r9443:
oops, and reassign life drain icon to fix these changes
Omega via svn r9444:
add icon removing, oops
ebmor via svn r9445:
Durumu: SetIconLifeDrain 2nd occurrence changed accordingly
Omega via svn r9446:
*Durumu Changes:
Switch force of will and rays back to pre casts since they were once again re-enabled by blizzard (these both come earlier than emote, plus are just better :) )
Fix beam phase for other difficulties. it's 55 seconds in all modes.
Adjust light spectrum timers slightly since they are a little different with new beam phase timing.
Add Cd for Dark Parasite
More icon cancel fixes to prevent nil errors as well as fix it so blue icon gets removed if red is nil.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-ThroneofThunder/Durumu.lua
Fix