Merge branch 'master' into develop

taylorotwell · taylorotwell · commit cc0908cddcab · 2013-01-05T16:07:59.000-06:00
diff --git a/laravel/database/connection.php b/laravel/database/connection.php
@@ -21,7 +21,7 @@ class Connection {
 	/**
 	 * The query grammar instance for the connection.
 	 *
-	 * @var Grammars\Grammar
+	 * @var Query\Grammars\Grammar
 	 */
 	protected $grammar;
 
diff --git a/laravel/database/schema.php b/laravel/database/schema.php
@@ -1,5 +1,6 @@
 <?php namespace Laravel\Database;
 
+use Closure;
 use Laravel\Fluent;
 use Laravel\Database as DB;
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Connection {`
`21`	`21`	`/**`
`22`	`22`	`* The query grammar instance for the connection.`
`23`	`23`	`*`
`24`		`- * @var Grammars\Grammar`
	`24`	`+ * @var Query\Grammars\Grammar`
`25`	`25`	`*/`
`26`	`26`	`protected $grammar;`
`27`	`27`