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

Conflicts:
	src/server/game/Spells/Auras/SpellAuraEffects.cpp

2 files changed, 3 insertions, 3 deletions

diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index 691546ac2fc..d5ad7f15a04 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -1139,7 +1139,7 @@ bool logChildren)
             dataKind == DataIsGlobal ||
             dataKind == DataIsStaticMember)
             continue;
-        
+
 
         symbolDetails.top().HasChildren = true;
         if (!logChildren)
@@ -1296,7 +1296,7 @@ DWORD_PTR WheatyExceptionReport::DereferenceUnsafePointer(DWORD_PTR address)
         return *(PDWORD_PTR)address;
     }
     __except (EXCEPTION_EXECUTE_HANDLER)
-    { 
+    {
         return DWORD_PTR(-1);
     }
 }
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h
index e57ed3fb8f7..9137b91aac9 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.h
+++ b/src/server/shared/Debugging/WheatyExceptionReport.h
@@ -120,7 +120,7 @@ struct SymbolDetail
             if (!formatted.empty())
                 formatted += " ";
             formatted += Name;
-        }    
+        }
         if (!Value.empty())
             formatted += " = " + Value;
         return formatted;