Merge

[biglad]

Merge

sql/world.sql (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/sql/world.sql) (0 lines added, 0 lines removed)
src/game/Spell.cpp (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/src/game/Spell.cpp) (2 lines added, 5 lines removed)
src/game/SharedDefines.h (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/src/game/SharedDefines.h) (1 lines added, 0 lines removed)
src/game/SpellMgr.cpp (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/src/game/SpellMgr.cpp) (5 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/src/game/SpellEffects.cpp) (1 lines added, 1 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/0db0bde5a3b4/src/shared/SystemConfig.h) (3 lines added, 3 lines removed)



More... (http://bitbucket.org/Azrael/mga-322a/changeset/0db0bde5a3b4/)