fixing merge conflicts.

artisan

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.3
+ * @version  3.1.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

changes.md

@@ -4,6 +4,8 @@
 
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
+- [Laravel 3.1.4](#3.1.4)
+- [Upgrading From 3.1.3](#upgrade-3.1.4)
 - [Laravel 3.1.3](#3.1.3)
 - [Upgrading From 3.1.2](#uprade-3.1.3)
 - [Laravel 3.1.2](#3.1.2)
@@ -13,7 +15,6 @@
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
-<<<<<<< HEAD
 <a name="3.2"></a>
 ## Laravel 3.2
 
@@ -29,6 +30,17 @@
 - Replace the **laravel** folder.
 - Add new **vendors** folder.
 
+<a name="3.1.4"></a>
+## Laravel 3.1.4
+
+- Fixes Response header casing bug.
+- Fixes SQL "where in" (...) short-cut bug.
+
+<a name="upgrade-3.1.4"></a>
+## Upgrading From 3.1.3
+
+- Replace the **laravel** folder.
+
 <a name="3.1.3"></a>
 ## Laravel 3.1.3
 

laravel/database/query/grammars/grammar.php

@@ -397,22 +397,24 @@ class Grammar extends \Laravel\Database\Grammar {
 	 * @param  array   $bindings
 	 * @return string
 	 */
-	public function shortcut($sql, $bindings)
+	public function shortcut($sql, &$bindings)
 	{
 		// Laravel provides an easy short-cut notation for writing raw WHERE IN
 		// statements. If (...) is in the query, it will be replaced with the
-		// correct number of parameters based on the bindings.
+		// correct number of parameters based on the query bindings.
 		if (strpos($sql, '(...)') !== false)
 		{
 			for ($i = 0; $i < count($bindings); $i++)
 			{
-				// If the binding is an array, we can just assume it's used to
-				// fill a "where in" condition, so we will just replace the
-				// next place-holder in the query with the constraint.
+				// If the binding is an array, we can just assume it's used to fill a
+				// where in condition, so we'll just replace the next place-holder
+				// in the query with the constraint and splice the bindings.
 				if (is_array($bindings[$i]))
 				{
 					$parameters = $this->parameterize($bindings[$i]);
 
+					array_splice($bindings, $i, 1, $bindings[$i]);
+
 					$sql = preg_replace('~\(\.\.\.\)~', "({$parameters})", $sql, 1);
 				}
 			}			

laravel/response.php

@@ -89,7 +89,7 @@ class Response {
 	{
 		$this->status = $status;
 		$this->content = $content;
-		$this->headers = $headers;
+		$this->headers = array_change_key_case($headers);
 	}
 
 	/**

paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.3
+ * @version  3.1.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.3
+ * @version  3.1.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */