Fixing bug in CWebUser#renewCookie which was causing it to ignore any configuration parameters speicified in user => identityCookie
Fixing CWebUser#restoreFromCookie to respect identityCookie options as well. Adding changelog line
oops, did not notice that changelog entries are ordered by type then number
fixing bug where time() was being added twice to the cookie expiration date. Once before we pass it to CWebUser::saveToCookie, and another time inside the function.
Unit test "CHtmlTest" has been updated exposing issue #2423
"CHtml::button()" has been updated to not enforce "value" attribute for the image buttons.
Issue #2423 has been added to CHANGELOG.
Merge pull request #2328 from f10i/master

Bug in CWebUser#renewCookie if config file contains identityCookie params
Improved documentation for php expressions

Fixes issue #1921
Various documentation and code style fixes
Merge branch 'master' of https://github.com/yiisoft/yii

* 'master' of https://github.com/yiisoft/yii:
  fixing bug where time() was being added twice to the cookie expiration date. Once before we pass it to CWebUser::saveToCookie, and another time inside the function.
  oops, did not notice that changelog entries are ordered by type then number
  Fixing CWebUser#restoreFromCookie to respect identityCookie options as well. Adding changelog line
  Fixing bug in CWebUser#renewCookie which was causing it to ignore any configuration parameters speicified in user => identityCookie
partial german translation update for the guide
Updated russian version of the guide.
Russian guide minor enhancements.
Demo blog, User model enhancements:

1. Added EOL at the end of file.
2. Added @throws tag to the User::generateSalt() method.
3. Removed invalid and unnecessary Yii::t() translation call.
4. Fixes #2375. `str_pad` replaced with `sprintf`.
Fixes #2426: CDbCriteria::__wakeup() used to issue an error in case SQL containing fields were arrays and criteria parameters were specified.
Merge pull request #2425 from klimov-paul/2423-image-button-value

Fixed #2423: CHtml::button() enforces "value" attribute for the image buttons
Merge branch '2426-CDbCriteria-wakeup' of https://github.com/resurtm/yii into resurtm-2426-CDbCriteria-wakeup

Conflicts:
	CHANGELOG
Changes in CClientScript::registerScriptFile() and CClientScript::registerScript() and new Active Record meta data management have been added to UPGRADE.
Merge pull request #2447 from klimov-paul/upgrade-missings-for-1.1.14

Some missing upgrade instructions for 1.1.14