Merge branch 'master' into develop

2012-06-21 11:38:50 -05:00
parent 1b062499dd 6e28d0bf2c
commit 7af0304fe8
3 changed files with 3 additions and 3 deletions
--- a/laravel/database/connection.php
+++ b/laravel/database/connection.php
@@ -194,7 +194,7 @@ class Connection {
 			return $statement->rowCount();
 		}
 		// For insert statements that use the "returning" clause, which is allowed
-		// by databsae systems such as Postgres, we need to actually return the
+		// by database systems such as Postgres, we need to actually return the
 		// real query result so the consumer can get the ID.
 		elseif (stripos($sql, 'insert') === 0 and stripos($sql, 'returning') !== false)
 		{