Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt

14 files changed, 0 insertions, 0 deletions

diff --git a/sql/old/3.3.5a/09521_character_achievement.sql b/sql/old/3.3.5a/09521_characters_character_achievement.sql
index e8262aed4ad..e8262aed4ad 100644
--- a/sql/old/3.3.5a/09521_character_achievement.sql
+++ b/sql/old/3.3.5a/09521_characters_character_achievement.sql
diff --git a/sql/old/3.3.5a/2011_04_14_00_characters.sql b/sql/old/3.3.5a/2011_04_14_00_characters_misc.sql
index ab9bd93419d..ab9bd93419d 100644
--- a/sql/old/3.3.5a/2011_04_14_00_characters.sql
+++ b/sql/old/3.3.5a/2011_04_14_00_characters_misc.sql
diff --git a/sql/old/3.3.5a/2011_04_19_00_characters.sql b/sql/old/3.3.5a/2011_04_19_00_characters_misc.sql
index 96536d67a03..96536d67a03 100644
--- a/sql/old/3.3.5a/2011_04_19_00_characters.sql
+++ b/sql/old/3.3.5a/2011_04_19_00_characters_misc.sql
diff --git a/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql b/sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql
index 24400b16a5c..24400b16a5c 100644
--- a/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql
diff --git a/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql
index e1c0529fffe..e1c0529fffe 100644
--- a/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql
diff --git a/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql b/sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql
index b90fa7d7682..b90fa7d7682 100644
--- a/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql
+++ b/sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql
diff --git a/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql b/sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql
index affb23f836c..affb23f836c 100644
--- a/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql
+++ b/sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql
diff --git a/sql/old/3.3.5a/2012_11_02_00_character_misc.sql b/sql/old/3.3.5a/2012_11_02_00_characters_misc.sql
index 9cbbd423bb8..9cbbd423bb8 100644
--- a/sql/old/3.3.5a/2012_11_02_00_character_misc.sql
+++ b/sql/old/3.3.5a/2012_11_02_00_characters_misc.sql
diff --git a/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql b/sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql
index a3e7c352788..a3e7c352788 100644
--- a/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql
+++ b/sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql
diff --git a/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql b/sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql
index 256bb1f7ad6..256bb1f7ad6 100644
--- a/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql
+++ b/sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql
diff --git a/sql/old/3.3.5a/2012_12_13_00_world.sql b/sql/old/3.3.5a/2012_12_13_00_world_misc.sql
index ab27796f933..ab27796f933 100644
--- a/sql/old/3.3.5a/2012_12_13_00_world.sql
+++ b/sql/old/3.3.5a/2012_12_13_00_world_misc.sql
diff --git a/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql b/sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql
index c6fc15e60b7..c6fc15e60b7 100644
--- a/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql
+++ b/sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql
diff --git a/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql b/sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql
index dc18ff71fe8..dc18ff71fe8 100644
--- a/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql
+++ b/sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql
diff --git a/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql b/sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql
index 89cc8f08cce..89cc8f08cce 100644
--- a/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql
+++ b/sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql