Merge remote-tracking branch 'upstream/develop' into develop

2012-06-25 13:11:54 -04:00
parent 17e75a9719 4d7d67dd82
commit f3d756476b
23 changed files with 320 additions and 21 deletions
--- a/laravel/database/schema/grammars/mysql.php
+++ b/laravel/database/schema/grammars/mysql.php
@@ -418,4 +418,4 @@ class MySQL extends Grammar {
 		return 'BLOB';
 	}

-}
+}