messages/ja/yii.php updated
requirements/messages/ja/yii.php updated
guide/ja/basics.application.txt updated
guide/ja/topics.auth.txt updated
guide/ja/extension.integration.txt updated
CDbCriteria::mergeWith fix
Merge pull request #2941 from softark/ja-update-2013-10-09

Ja update 2013-10-09
[ci skip]
Added a line in CHANGELOG
Merge pull request #2942 from softark/cdbcriteria-mergewith-fix

CDbCriteria::mergeWith fix
Title attribute at 'CJuiTabs::headerTemplate' changed to be filled by {title}
Fixes #2945: dots in url rules should not match any character
added official support for MariaDB to the guide

fixes #2955
more documentation adjustments to mention MariaDB

fixes #2955
CFileValidator fixed to encode file name, while composing error messages.
Issue #2959 added to CHANGELOG
Merge pull request #2960 from klimov-paul/2959-file-validator-encode-filename

Fix #2959 file validator encode filename
[UK][Guide] typos
 [ci skip]
Merge pull request #2962 from yiiframework-com-ua/uk_docs

[UK][Guide] typos
Updated changelog
No longer using basename for in CAssetManager::generatePath, fixes #2963