fixed conflicts.

changelog.md

 # Laravel Change Log
 
+## Version 1.5.5
+
+- Fix bug in session class cookie option extraction.
+
+### Upgrading From 1.5.4
+
+- Replace **system** directory.
+
 ## Version 1.5.4
 
 - Fix bug in Eloquent belongs_to relationship eager loading.

laravel/session/driver.php

@@ -233,7 +233,7 @@ abstract class Driver {
 		{
 			$minutes = (Config::get('session.expire_on_close')) ? 0 : Config::get('session.lifetime');
 
-			Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('http_only'));
+			Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('session.http_only'));
 		}
 	}