Add html5 form elements
Resolve merge conflicts
resolve merge conflicts
Merge branch 'master' of git://github.com/yiisoft/yii into HEAD
Add new inputs to CFormInputElement, update CHANGELOG
Fix indents
Bug #2874: Fixed duplicate columns selection for HAS_MANY relation with composite primary key
Merge pull request #2874 from borro/patch-1

Foreach on the $this->_pkAlias
Update CHANGELOG
Update CFormInputElement.php
Merge pull request #2799 from codemix/html5-elements-squash

Add HTML5 input support