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

Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp

3 files changed, 20 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_01_19_00_auth_rbac_permissions.sql b/sql/updates/auth/2014_01_19_00_auth_rbac_permissions.sql
new file mode 100644
index 00000000000..266f8ab15bb
--- /dev/null
+++ b/sql/updates/auth/2014_01_19_00_auth_rbac_permissions.sql
@@ -0,0 +1,10 @@
+SET @id = 777;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id`=@id;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id, 'Command: mailbox');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, @id);
diff --git a/sql/updates/world/2014_01_19_00_world_misc.sql b/sql/updates/world/2014_01_19_00_world_misc.sql
new file mode 100644
index 00000000000..7771527a5a2
--- /dev/null
+++ b/sql/updates/world/2014_01_19_00_world_misc.sql
@@ -0,0 +1,5 @@
+UPDATE `smart_scripts` SET `action_param1`=61752, `target_type`=7, `target_param1`=0, `comment`='Illidan Stormrage - On Just Died - Invoker Cast \'Illidan Kill Credit Master\'' WHERE `entryorguid`=32588 AND `source_type`=0 AND `id`=5;
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=61752;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(61752, 'spell_q13400_illidan_kill_master');
diff --git a/sql/updates/world/2014_01_19_01_world_command.sql b/sql/updates/world/2014_01_19_01_world_command.sql
new file mode 100644
index 00000000000..a11c6b09787
--- /dev/null
+++ b/sql/updates/world/2014_01_19_01_world_command.sql
@@ -0,0 +1,5 @@
+SET @id = 777;
+
+DELETE FROM `command` WHERE `name` = 'mailbox';
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES
+('mailbox', @id, 'Syntax: .mailbox\r\n\r\nShow your mailbox content.');