Merge remote branch 'origin/master' into 400
 

<pre>m src/game/DBCEnums.h
m src/game/Unit.cpp
m src/game/UnitAuraProcHandler.cpp
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge remote branch 'origin/master' into 400

Conflicts:
src/game/DBCEnums.h
src/game/DBCStructure.h
src/game/DBCfmt.h
src/game/MiscHandler.cpp
src/game/ObjectMgr.cpp
src/game/Spell.cpp
src/game/SpellAuras.cpp
src/game/SpellEffects.cpp
src/game/SpellMgr.cpp
src/game/Unit.cpp
src/game/UnitAuraProcHandler.cpp
src/game/World.cpp</pre>




Дальше...