kohana/core — pull request #558 by enov (2014-09-26 06:23:09+00:00)
Title: Merge 3.2/master into 3.3/develop

Merge conflicts resolution:

The following files had merge conflicts.

These files were kept as they were in 3.3/develop:

- classes/Kohana/Arr.php
- classes/Kohana/Config/Group.php
- classes/Kohana/Config/Source.php
- classes/Kohana/Config/Writer.php
- classes/Kohana/Debug.php
- classes/Kohana/HTTP.php
- classes/Kohana/HTTP/Header.php
- classes/Kohana/HTTP/Message.php
- classes/Kohana/HTTP/Request.php
- classes/Kohana/HTTP/Response.php
- classes/Kohana/Log/StdErr.php
- classes/Kohana/Log/StdOut.php
- classes/Kohana/Response.php
- classes/Kohana/UTF8.php
- guide/kohana/index.md
- guide/kohana/mvc/controllers.md
- guide/kohana/routing.md
- guide/kohana/upgrading.md
- system/utf8/ucwords.php
- classes/Kohana/Core.php
- tests/kohana/ArrTest.php
- tests/kohana/Config/File/ReaderTest.php
- tests/kohana/Config/GroupTest.php
- tests/kohana/CoreTest.php
- tests/kohana/DebugTest.php
- tests/kohana/Http/HeaderTest.php

These files have some changes merged:

- classes/Kohana/UTF8.php (mb_substitute_character set/reset)
- classes/Kohana/Request.php (merged changes from 3.2.3)
- classes/Kohana/Route.php (merged changes from 3.2.3)
- classes/Kohana/Text.php (merged widont function from 3.2.3)
- tests/kohana/RequestTest.php (merged tweaked changes from 3.2.3)
- tests/kohana/RouteTest.php (merged changes from 3.2.3)