Omega via svn r9795:
ru update
Small tortos update
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-Core/DBM-Core.lua
Omega via svn r9796:
##Add option to control the chat frame icons in case it does distort in some fonts it can be turned off by specific users instead of just globally forced on or off for everyone. this option should be default to on and disabled for those that it causes problems for since it should work fine for most.
Omega via svn r9797:
update kolt sounds with new recordings that should be a little easier to hear hopefully
Omega via svn r9798:
Add Orgrimmar raid since EJ info is data mined now and all bosses are known.
Fix flex difficulty detection.
Omega via svn r9799:
it's seige, not fall
Fix
Fix
nbluewiz via svn r9800:
# koKR update.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-SiegeOfOrgrimmar/FallenProtectors.lua
	DBM-SiegeOfOrgrimmar/FoOTrash.lua
	DBM-SiegeOfOrgrimmar/Galakras.lua
	DBM-SiegeOfOrgrimmar/GarroshHellscream.lua
	DBM-SiegeOfOrgrimmar/GeneralNazgrim.lua
	DBM-SiegeOfOrgrimmar/Immerseus.lua
	DBM-SiegeOfOrgrimmar/IronJuggernaut.lua
	DBM-SiegeOfOrgrimmar/KorkronDarkShaman.lua
	DBM-SiegeOfOrgrimmar/Malkorok.lua
	DBM-SiegeOfOrgrimmar/Norushen.lua
	DBM-SiegeOfOrgrimmar/ParagonsOfTheKlaxxi.lua
	DBM-SiegeOfOrgrimmar/ShaofPride.lua
	DBM-SiegeOfOrgrimmar/SiegecrafterBlackfuse.lua
	DBM-SiegeOfOrgrimmar/SpoilsOfPandria.lua
	DBM-SiegeOfOrgrimmar/ThokTheBloodthirsty.lua
	DBM-SiegeOfOrgrimmar/localization.en.lua
Omega via svn r9801:
More TOM_RUS load changes. This can actually be used to fix onyxia mod since it works when ZONE_CHANGED_NEW_AREA doesn't fire.
Add loadzone info for Siege of Orgrimmar
Omega via svn r9802:
Updates to last
Omega via svn r9803:
Readd scenario check. i should be more thorough in reviewing code changes. scenario mods would have been broken completely by this after first scenario. the code only started combat on load, once loaded, it never checked scenario mods and never started combat
Omega via svn r9804:
Fix a nil though
Omega via svn r9805:
Fix scenario mods. it looks like they were 100% broken with new load code. Seems working now, but it does mean having two load methods fire in all instances, i new adding this load code was premature. oh well
Omega via svn r9806:
Fixes
Omega via svn r9807:
Fix some bad merging
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-Core/DBM-Core.lua
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
tandanu via svn r9808:
Core:
* make sure that all scheduled methods are called properly (just in case if someone ever decides to use self there...)

Megaera: typo