Omega via svn r9572:
Fix a lei shen bug with not announcing static shock or overcharge during non intermission phases when you are a melee spec
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
Omega via svn r9573:
Add in some notes/ideas for complete merge of timer/countdown object.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
Omega via svn r9574:
Hmm, i missed one of teh events that should have used the important sound. fixing that
Omega via svn r9575:
also an options text tweak on reinforcements. it's a target warning to make auto localizing easier but the option text should still be spell.
Omega via svn r9576:
and don't yell on amber prison in LFR, it doesn't spread there
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-HeartofFear/localization.en.lua
	DBM-Party-MoP/localization.en.lua
	DBM-Party-MoP/localization.ru.lua
	DBM-TerraceofEndlessSpring/localization.en.lua