Merge branch 'master' into 2.5

Conflicts:
	lib/Cake/VERSION.txt

lib/Cake/Routing/Dispatcher.php

@@ -243,7 +243,7 @@ class Dispatcher implements CakeEventListener {
  * Load controller and return controller classname
  *
  * @param CakeRequest $request
- * @return string|bool Name of controller class name
+ * @return string|boolean Name of controller class name
  */
 	protected function _loadController($request) {
 		$pluginName = $pluginPath = $controller = null;

lib/Cake/Routing/DispatcherFilter.php

@@ -31,7 +31,7 @@ abstract class DispatcherFilter implements CakeEventListener {
 /**
  * Default priority for all methods in this filter
  *
- * @var int
+ * @var integer
  */
 	public $priority = 10;
 

lib/Cake/Routing/Filter/AssetDispatcher.php

@@ -31,7 +31,7 @@ class AssetDispatcher extends DispatcherFilter {
  * Default priority for all methods in this filter
  * This filter should run before the request gets parsed by router
  *
- * @var int
+ * @var integer
  */
 	public $priority = 9;
 

lib/Cake/Routing/Filter/CacheDispatcher.php

@@ -27,7 +27,7 @@ class CacheDispatcher extends DispatcherFilter {
  * Default priority for all methods in this filter
  * This filter should run before the request gets parsed by router
  *
- * @var int
+ * @var integer
  */
 	public $priority = 9;
 

lib/Cake/Routing/Router.php

@@ -784,7 +784,7 @@ class Router {
  *   or an array specifying any of the following: 'controller', 'action',
  *   and/or 'plugin', in addition to named arguments (keyed array elements),
  *   and standard URL arguments (indexed array elements)
- * @param bool|array $full If (bool) true, the full base URL will be prepended to the result.
+ * @param boolean|array $full If (bool) true, the full base URL will be prepended to the result.
  *   If an array accepts the following keys
  *    - escape - used when making URLs embedded in html escapes query string '&'
  *    - full - if true the full base URL will be prepended.