Merge tag '2.0.5', this is now 2.0.6-dev

- Fixed #9070 `ViewAction::resolveViewName()` not to accept `/../` and `/./`

Conflicts:
	framework/BaseYii.php
	framework/CHANGELOG.md

framework/BaseYii.php

@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.5-dev';
+        return '2.0.6-dev';
     }
 
     /**

framework/CHANGELOG.md

@@ -1,7 +1,7 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.5 under development
+2.0.6 under development
 -----------------------
 
 - Bug #7305: Logging of Exception objects resulted in failure of the logger i.e. no logs being written (cebe)
@@ -24,7 +24,6 @@ Yii Framework 2 Change Log
 - Bug #8772: ActiveQuery failed removing duplicate records after join when the resultset did not contain the pk values e.g. after grouping (cebe)
 - Bug #8900: Fixed determine active menu item with url-alias in route `\yii\widgets\Menu::isItemActive()` (demi)
 - Bug #9046: Fixed problem with endless error loop when an error occurred after sending a stream or file download response to the user (cebe)
-- Bug #9070: Fixed `ViewAction::resolveViewName()` not to accept `/../` and `/./` (thejahweh, samdark) 
 - Bug: Fixed string comparison in `BaseActiveRecord::unlink()` which may result in wrong comparison result for hash valued primary keys starting with `0e` (cebe)
 - Bug: Pass correct action name to `yii\console\Controller::options()` when default action was requested (cebe)
 - Bug: Automatic garbage collection in `yii\caching\FileCache` was not triggered (kidol)
@@ -46,6 +45,13 @@ Yii Framework 2 Change Log
 - Chg #6354: `ErrorHandler::logException()` will now log the whole exception object instead of only its string representation (cebe)
 - Chg #8556: Extracted `yii\web\User::getAuthManager()` method (samdark)
 
+
+2.0.5 July 11, 2015
+-------------------
+
+Bug #9070 (CVE-2015-5467): Fixed `ViewAction::resolveViewName()` not to accept `/../` and `/./` (thejahweh, samdark)
+
+
 2.0.4 May 10, 2015
 ------------------