Merge fix.

[newsbot]

<pre>m src/game/Creature.cpp
m src/game/CreatureAI.cpp
m src/game/CreatureEventAI.cpp
m src/game/DBCStores.cpp
m src/game/DBCStructure.h
m src/game/DBCfmt.h
m src/game/MiscHandler.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/Spell.cpp
m src/game/SpellMgr.cpp
m src/game/Unit.cpp
m src/game/WorldSocket.cpp
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge fix.</pre>




Дальше...