Merge pull request #2146 from armab/patch-1

Update framework/validators/CEmailValidator.php
Merge branch 'master' of git://github.com/horechek/yii into horechek-master
added changelog line for #1866
Merge branch 'gettextMessageSourceCachingFix' of git://github.com/odevyatkov/yii into odevyatkov-gettextMessageSourceCachingFix
added changelog line for #1997
Refactored CHttpRequest::getDelete and CHttpRequest::getPut not to use _restParams directly
Merge branch 'patch-1' of git://github.com/s-larionov/yii into s-larionov-patch-1
Fixes #2048: AR now uses alias from CActiveRecord::getTableAlias instead of always using default "t"
Fixing some typos, PHPDocs
[ci skip]
Fixes #2069: Upgraded jQuery BBQ Plugin to 1.4pre to fix jQuery compatibility problems
Fixing spaces
[ci skip]
Revert "Merge branch 'master' of git://github.com/horechek/yii into horechek-master"

This reverts commit c6670657b7a395fafdef3360bf598d4619993a37, reversing
changes made to 903c0a991f4fc0be442a9b7aa9230190fb21c2f8.
Revert "added changelog line for #1866"

This reverts commit c269a68a6a4eb2e94dc41de94e33151396ee9541.
Replacing spaces with tabs
[ci skip]
Replacing spaces with tabs
[ci skip]
Replacing spaces with tabs
[ci skip]
Replacing spaces with tabs
[ci skip]
"CHtml::script()" and "CHtml::scriptFile()" have been updated allowing to compose HTML options.
Code intending at "CHtmlTest" has been changed from spaces to tabs.
Merge branch 'master' of github.com:lubosdz/yii