Merge pull request #1259 from Blizzke/master

Updated Dutch translation
Update framework/web/filters/CHttpCacheFilter.php

Small fix for phpdoc
Added /docs/guide/fr/basics.mvc.txt
Merge pull request #1262 from marsuboss/patch-2

Added /docs/guide/fr/basics.mvc.txt
[ci skip]
Merge pull request #1261 from DaSourcerer/patch-17

Small fix for phpdoc in framework/web/filters/CHttpCacheFilter.php
[ci skip]
Added /docs/guide/fr/basics.controller.txt
Added /docs/guide/fr/caching.overview.twt
Merge pull request #1270 from marsuboss/patch-2

Added /docs/guide/fr/caching.overview.txt
[ci skip]
Merge pull request #1269 from marsuboss/patch-1

Added /docs/guide/fr/basics.controller.txt
[ci skip]
ajaxUpdate is never false in jquery.yiilistview.js
[docs][blog] 'yiic' to 'Gii'
Merge branch 'master' into docs-ja
Merge pull request #1273 from softark/docs-ja

[docs][blog], [docs][blog][ja] changed 'yiic' to 'Gii'

[ci skip]
Method "CWebUser::getReturnUrl()" has been fixed, allowing to determine default URL correctly if "CUrlManager::showScriptName" is set to "false".
Fix for issue #126 has been added to CHANGELOG.
Merge branch 'master' of git://github.com/yiisoft/yii into 556-mysql-column-comment
Preparations for merging fixes of the #556 into 1.1.13 codebase.
Fixes #1084 and #1282.
Some refinements for previous commit.
Additional tests and proper usage of the mb_* functions.