Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
Adds onBeforeCount for Active Records, fixes #1353
phpdoc correction for onbeforecount #1353
Fixed #1933: In the elements CHtml::activeDropDownList, CHtml::ListBox, CHtml::DropDownList multiple fixed bug with multiple parammetrom if false
update changelog #1933
Merge branch 'master' of https://github.com/yiisoft/yii.git
Added missing activeSearchField() method to CHtml. And searchField() to CActiveForm. For creation of HTML input field of type search, that fixes #1743
small fixed #1933: $var!==false -> !empty($var)
small fix remove #1933: remove isset
Merge branch 'master' of https://github.com/yiisoft/yii.git
Fixes #1957. Add Primary Key syntax for MySql schema. Also adds support of an Array
of columns rather than just a string
Add changelog lines
Enh #2131: Added Accept header parsing to CHttpRequest to give an array
of accepted types in order of preference
TABS Ident fix.
Fixes #1895: erroneous language attributes in french views.
Merge pull request #2208 from malyshev/master

Issue #2205: CActiveForm the tag name for the error container tag is hardcoded
Changelog line moved and rephrased.
Merge remote-tracking branch 'upstream/master' into
2131-add-accept-header-parsing

Conflicts:
	CHANGELOG