Merge pull request #1 from EQEmu/master

update
Identified the routines needed to augment items in RoF. Currently, only Insert and Remove are supported. Swap and Destroy do not work due to missing functions related to the cursor.
Bot fixes for previous commit
Add #shownumhits workaround command to show numhits
Client timer issue fix
Fix iterator on mercstance crash bug
Merge pull request #244 from addtheice/merc_stance_fix

Fix iterator on mercstance crash bug
Fix logging macros

macros should be fully wrapped in do { ... } while(false) to prevent
any accidental coding issues (like else being eaten!!!)
Fix for losing 2nd and 3rd cursor items after zoning
Fix for gcc failure - Can't fix stupid!
Merge branch 'master' of https://github.com/regneq/Server-1
Merge branch 'master' of https://github.com/EQEmu/Server