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

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 156581e8cd2..233a8d82497 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -350,10 +350,10 @@ class instance_blood_furnace : public InstanceMapScript
                         ++PrisonerCounter8;
                     }
                     else
-                    	return;
+                        return;
                 }
                 else
-                	return;
+                    return;
 
                 ResetPrisoner(creature);
             }