Carbenium fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4 ...

Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp

2015-07-22 00:26:09 +02:00

..

auth

Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4

2015-07-22 00:26:09 +02:00

characters

TDB 335.58 - 2015/03/21

2015-03-21 22:06:46 +00:00

world

Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4

2015-07-22 00:26:09 +02:00