Fixed missing version parameter in DB select in GetZoneWeather.
Fixed a couple of memory leaks.
Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support.
Merge branch 'master' of https://github.com/EQEmu/Server into Mercs

Conflicts:
	changelog.txt
Changelog fix.
Fixed memory leak in OP_VeteranRewardsAvailable
Initialised some data in Mob/Merc constructors to stop valgrind complaining.
Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
Merge pull request #37 from mackal/stacking_SE_Limits

Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aur...
Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt
Merge branch 'master' into rof-guilds