Merge branch 'develop' of http://github.com/laravel/laravel into develop/exception

laravel/request.php

@@ -34,7 +34,7 @@ class Request {
 	 */
 	public static function uri()
 	{
-		return URI::get();
+		return URI::current();
 	}
 
 	/**

laravel/uri.php

@@ -86,6 +86,7 @@ class URI {
 		{
 			return substr($uri, strlen($value));
 		}
+		return $uri;
 	}
 
 	/**