Merge branch 'master' of github.com:laravel/laravel

laravel/cli/tasks/migrate/resolver.php

@@ -116,7 +116,7 @@ class Resolver {
 			// naming collisions with other bundle's migrations.
 			$prefix = Bundle::class_prefix($bundle);
 
-			$class = $prefix.substr($name, 18);
+			$class = $prefix.\Laravel\Str::classify(substr($name, 18));
 
 			$migration = new $class;
 

laravel/database/eloquent/model.php

@@ -465,7 +465,7 @@ abstract class Model {
 	 */
 	public function table()
 	{
-		return static::$table ?: strtolower(Str::plural(basename(get_class($this))));
+		return static::$table ?: strtolower(Str::plural(class_basename($this)));
 	}
 
 	/**

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -21,7 +21,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 	protected $other;
 
 	/**
-	 * The columns on the joining tbale that should be fetched.
+	 * The columns on the joining table that should be fetched.
 	 *
 	 * @var array
 	 */

laravel/validator.php

@@ -692,7 +692,7 @@ class Validator {
 		{
 			return $this->messages[$custom];
 		}
-		elseif (Lang::has($custom = "validation.custom.{$custom}", $this->language))
+		elseif (Lang::has($custom = "{$bundle}validation.custom.{$custom}", $this->language))
 		{
 			return Lang::line($custom)->get($this->language);
 		}