because fuck you mercs and bots
Merc/bot fix changelog.txt
Merge pull request #4 from EQEmu/master

Merge of 11-03-2014
Merge branch 'master' of https://github.com/Kinglykrab/Server
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/merc.h