"CHtml::script()" and "CHtml::scriptFile()" have been updated allowing to compose HTML options.
Code intending at "CHtmlTest" has been changed from spaces to tabs.
Unit tests for "CClientScriptTest::registerScript()" and "CClientScriptTest::registerScriptFile()" have been added.
"CClientScriptTest" has been updated allowing to register script files with html options.
Unit test for "CClientScript" rendering scripts has been added.
"CClientScript" has been updated allowing to register scripts with HTML options.
E_NOTICE at "CClientScript::renderScriptBatch()" has been fixed.
"CClientScript::renderScriptBatch()" has been refactored allowing to group scripts with the same HTML options.
Issue #1724 has been added to CHANGELOG
Merge branch 'master' of git://github.com/yiisoft/yii into 1724-Allow-script-html-options
Code intending at "CClientScript" has been fixed: spaces have been replaced by tabs.
Position of issue #1724 mention at CHANGELOG has been fixed.
doc fix
Added Catalan Translation.
CWebApplication::$controllerMap property: PHPDoc typo.
Merge pull request #2182 from resurtm/CWebApplication-controllerMap-typo

CWebApplication::$controllerMap property: PHPDoc typo.
[ci skip]
Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2.
UPGRADE refinement.
Merge pull request #2178 from ArnauAregall/aaregall-catalan-translation

Catalan Translation
Merge pull request #2183 from resurtm/Net_IDNA2

Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2.