Merge remote-tracking branch 'upstream/master' into Warning_Cleanup

Conflicts:
	zone/client_packet.cpp
This commit is contained in:
Arthur Dene Ice
2014-05-19 22:23:03 -07:00
12 changed files with 145 additions and 68 deletions
@@ -0,0 +1 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FocusCombatProcs', 'false', 'Allow all combat procs to receive focus (ignores focus limit).');