Merge remote-tracking branch 'remotes/origin/master' into logging_changes

Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp

utils/sql/git/bots/deprecated/load_bots_old.sql

@@ -194,7 +194,7 @@ CREATE TABLE `botguildmembers` (
 	PRIMARY KEY  (`char_id`)
 ) ENGINE=InnoDB;
 
-DELIMITER //
+DELIMITER $$
 		
 CREATE FUNCTION `GetMobType` (mobname VARCHAR(64)) RETURNS CHAR(1)
 BEGIN
@@ -209,7 +209,7 @@ BEGIN
 	END IF;
 	
 RETURN Result;
-END//
+END$$
 
 DELIMITER ;
 

utils/sql/git/bots/load_bots.sql

@@ -194,7 +194,7 @@ CREATE TABLE `botguildmembers` (
 	PRIMARY KEY  (`char_id`)
 ) ENGINE=InnoDB;
 
-DELIMITER \\
+DELIMITER $$
 
 CREATE FUNCTION `GetMobType` (mobname VARCHAR(64)) RETURNS CHAR(1)
 BEGIN
@@ -209,7 +209,7 @@ BEGIN
 	END IF;
 	
 	RETURN Result;
-END\\
+END$$
 
 DELIMITER ;