Merge branch 'master' into 330

[newsbot]

<pre>m sql/mangos.sql
m sql/mangos_spell_check.sql
+ sql/updates/9690_01_mangos_spell_proc_event.sql
m sql/updates/Makefile.am
m src/game/ObjectMgr.cpp
m src/game/SpellEffects.cpp
m src/shared/revision_nr.h
m src/shared/revision_sql.h

Merge branch 'master' into 330</pre>



Дальше... (http://github.com/mangos/mangos/commit/18bc24d24eeb1903546a82d5842cbbbc34cf0b5a)