#1515  Use index support in relations
fix changelog
fix changelog
replaced spaces to tabs
enh #94, added support for document/literal WSDL in generator, inspired by Zend 2.0 Soap Autodiscover class
enh #94, added a wrapper in CWebService handling method arguments and response in document mode
enh #89, support for SOAP headers in WSDL generator
Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' into 89-soap-header

Conflicts:
	CHANGELOG
Merge branch 'master' into 94-document-literal-wsdl

Conflicts:
	CHANGELOG
	framework/web/services/CWsdlGenerator.php
Enhance CJSON with JsonSerializable support (#2540)
removed unnecessary spaces
Fix #2670
Update getUserHostAddress()
Update getUserHostAddress()
Merge branch 'pr/1849'
Additions to #1849.
Merge branch 'master' into 89-soap-header

Conflicts:
	CHANGELOG
Merge branch 'master' into 94-document-literal-wsdl

Conflicts:
	CHANGELOG