Omega via svn r9893:
Sha of tables, er, pride. (SOO MANY multi target abilities)
Omega via svn r9894:
Fix second bouncing bolt timer on heroic. 303 pulls, and i watched timer be 2 seconds off 303 times, and never got around to fixing it, oops.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-SiegeOfOrgrimmar/KorkronDarkShaman.lua
	DBM-SiegeOfOrgrimmar/ShaofPride.lua
	DBM-SiegeOfOrgrimmar/localization.en.lua