Merge branch 'master' of git://github.com/EQEmu/Server
Merge branch 'master' of git://github.com/EQEmu/Server
Merge branch 'master' of git://github.com/EQEmu/Server
Fixed missing include that blocked compile on linux.
Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc
More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum)
Forgot to update changelog.txt earlier
Merge pull request #24 from af4t/master

Forgot to update changelog.txt earlier
Stop NPCs from aggroing each other with buffs/beneficial spells.
Stop NPCs from aggroing each other with buffs/beneficial spells.
Merge branch 'master' of https://github.com/af4t/Server

Conflicts:
	zone/spells.cpp
Merge pull request #23 from addtheice/master

Fixed missing include that blocked compile on linux.
Merge pull request #27 from af4t/master

Fix NPCs aggro each other from beneficial spells
Changed some stuff to keep it consistent with old behavior: was seeing crashes related to ptimers on peq.
Merge branch 'master' into rof-guilds