Merge branch `master` into `boost`

Conflicts:
               BattlegroundMgr.h

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql b/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql
new file mode 100644
index 00000000000..068c9c0a098
--- /dev/null
+++ b/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql
@@ -0,0 +1,10 @@
+SET @id = 631;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id`=@id;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id, 'Command: reload battleground_template');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, @id);