nbluewiz via svn r10302:
# Core: Remove GetFullNameByShortName function completely. That not needed at all because 5.4 API UnitName() changes.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
ultrashining via svn r10303:
zhTW update
Omega via svn r10304:
fix countdown bug
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
Omega via svn r10305:
fix error
Omega via svn r10306:
Change couple things to count warnings
Fix
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline
ebmor via svn r10307:
SoO: Galakras SetUsedIcons; deDE update
Omega via svn r10308:
add timer for the protodrake wave. also, use EJ for adds and reduce locals some
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-SiegeOfOrgrimmar/Galakras.lua
Fix