Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp
index 34a7bf8bb9d..1ed29d5106a 100644
--- a/src/server/shared/Threading/Threading.cpp
+++ b/src/server/shared/Threading/Threading.cpp
@@ -59,10 +59,10 @@ ThreadPriority::ThreadPriority()
             }
         }
 
-        //since we have only 7(seven) values in enum Priority
-        //and 3 we know already (Idle, Normal, Realtime) so
-        //we need to split each list [Idle...Normal] and [Normal...Realtime]
-        //into piecies
+        // since we have only 7(seven) values in enum Priority
+        // and 3 we know already (Idle, Normal, Realtime) so
+        // we need to split each list [Idle...Normal] and [Normal...Realtime]
+        // into pieces
         const size_t _divider = 4;
         size_t _div = (norm_pos - min_pos) / _divider;
         if (_div == 0)