Updated #cvs to display RoF2 Client Stream count
Potential fix for RoF2 random crashes during zoning.
Merge branch 'master' of https://github.com/EQEmu/Server
Fix for RoF2 Selling to Merchant.
(RoF2) Fixed Extended Targets Window by correcting opcodes.
variable rename, readability
Fix missing {} in SE_*Counter bonus processing
Add a few missing bonus recalcs
(RoF/RoF2) Fixed Guild Rank in the Player Profile, which prevents the guild rank message on login/zone.
Force changing the timer_time for attack timers

Should fix issues with waiting for a slow timer after a cure
Merge pull request #71 from EQEmu/master

Update to master