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
Allow for primary log rotation by copy and truncate rather than rename
Fixes #289: Gii module could be submodule of an another module.
Merge branch 'master' of git://github.com/yiisoft/yii.git
FIX: CDbCacheDependency with reuseDependentData did not invalidate cache when getting cache across different requests (marcovtwout)
Add Unit test for reusableData test, see #2290
Fixes #2122: CActiveRecord, lazy load: 'params' from relations used in 'through' option were not applied to the final SQL statement.
Replace CCacheDependencyTest with version from klimov-paul (https://github.com/yiisoft/yii/pull/2290)
Make $reusableData protected instead of private, so we can reset in subclass.
Merge branch 'master' of git://github.com/yiisoft/yii.git into 2289-CDbCacheDependency-reuseDependentData-fix
CStatElement ambiguous fields with join table with composite PK fixed.
Revert "Make $reusableData protected instead of private, so we can reset in subclass."

This reverts commit 00119b13e5c782672ffd979e313a3d911f71e861.
Update DOC comment
Merge branch 'master' of git://github.com/yiisoft/yii.git into 2289-CDbCacheDependency-reuseDependentData-fix
Remove extra spaces
Merge pull request #2318 from klimov-paul/stat-element-ambigous-composite-pk

CStatElement ambiguous fields error with join table with composite PK fixed.