* 'master' of https://github.com/yiisoft/yii: (651 commits)
Updated guide Gii Model Generator page screenshot.
adjusted CHANGELOG
Requirements checking slightly improved.
Enhanced CHANGELOG description
Requirements checker: added support of the Oracle database (pdo_oci extension)
MSSQL driver types refinements.
Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
Language fixes.
Preparations for merging fixes of the #556 into 1.1.13 codebase.
[docs][blog] 'yiic' to 'Gii'
ajaxUpdate is never false in jquery.yiilistview.js
Added /docs/guide/fr/caching.overview.twt
Added /docs/guide/fr/basics.controller.txt
Added /docs/guide/fr/basics.mvc.txt
Update framework/web/filters/CHttpCacheFilter.php
Update docs/guide/fr/toc.txt
[NL] Dutch messages translation updated
added history.js license
prepare for next release.
prepare for 1.1.12 release.
...
Conflicts:
CHANGELOG