fixed a few bugs.

laravel/ioc.php

@@ -24,9 +24,10 @@ class IoC {
 	 */
 	public static function bootstrap($registry = array())
 	{
-		Config::load('container');
-
-		static::$registry = Config::$items['container'];
+		if (Config::load('container'))
+		{
+			static::$registry = Config::$items['container'];
+		}
 	}
 
 	/**

laravel/session/payload.php

@@ -171,7 +171,9 @@ class Payload {
 	 */
 	public function reflash()
 	{
-		$this->session['data'][':new:'] += $this->session['data'][':old:'];
+		$old = $this->session['data'][':old:'];
+
+		$this->session['data'][':new:'] = array_merge($this->session['data'][':new:'], $old);
 	}
 
 	/**