Merge branch 'master' of github.com:laravel/laravel

laravel/auth/drivers/driver.php

@@ -215,7 +215,7 @@ abstract class Driver {
 	 */
 	protected function recaller()
 	{
-		return $this->name().'_remember';
+		return Config::get('auth.cookie', $this->name().'_remember');
 	}
 
 	/**
@@ -228,4 +228,4 @@ abstract class Driver {
 		return strtolower(str_replace('\\', '_', get_class($this)));
 	}
 
-}
+}

laravel/profiling/profiler.php

@@ -146,9 +146,9 @@ class Profiler {
 		foreach ($bindings as $binding)
 		{
 			$binding = Database::escape($binding);
-
+			
 			$sql = preg_replace('/\?/', $binding, $sql, 1);
-			$sql = htmlspecialchars($sql);
+			$sql = htmlspecialchars($sql, ENT_QUOTES, 'UTF-8', false);
 		}
 
 		static::$data['queries'][] = array($sql, $time);