Issue #1966 - CWsdlGenerator now supports soap indicators (sequence, choice), injecting of custom WSDL string block and generation of human-friendly documentation for complex types. Added unit test.
Merge branch 'master' of github.com:lubosdz/yii
Merge branch 'master' of https://github.com/yiisoft/yii
Fixed conflict with text/xml header.
Changed signature of CWsdlGenerator::buildHtmlDocs($return=false) to callable from other script. Also needed for unit test.
Merge branch 'master' of https://github.com/lubosdz/yii
Fixes #2336: PostgreSQL: CDbCommandBuilder uses `NULL` instead of `DEFAULT` as default value for the primary keys of serial type.
Removed debugging group declaration.
Fixes #2435: CFileCache entry expiration time could now be embedded into the cache file.
Merge branch 'master' of https://github.com/lubosdz/yii
Fixed code styling and few typos in documentation.
Merge branch 'master' of https://github.com/lubosdz/yii
Merge branch 'master' of github.com:lubosdz/yii into lubosdz-master

Conflicts:
	CHANGELOG
Fixes #1916: CMssqlSchema::findColumns() issues an "invalid object name" error.
Merge branch 'master' of github.com:yiisoft/yii
CHtml ajax doc fix
Merge branch 'master' of git://github.com/yiisoft/yii into 2448-CHtml-ajax-doc-fix
Merge pull request #2505 from nsanden/2448-CHtml-ajax-doc-fix

2448 c html ajax doc fix
Update doc block for getRelated method in CActiveRecord class.
Update doc block for getRelated method in CActiveRecord class.
Merge pull request #2506 from ThePepster/master

Update doc block for getRelated method in CActiveRecord class.
[ci skip]
[SK] Updated locales
Merge pull request #2507 from lubosdz/master

[SK] Updated locale