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
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
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
Added "bin" key to composer.json. (#2314 merged manually.)
docs/guide/ja/basics.component.txt updated
Merge pull request #2319 from softark/docs-ja

docs/guide/ja/basics.component.txt updated
Merge pull request #2318 from klimov-paul/stat-element-ambigous-composite-pk

CStatElement ambiguous fields error with join table with composite PK fixed.
Merge pull request #2290 from marcovtwout/2289-CDbCacheDependency-reuseDependentData-fix

FIX: CDbCacheDependency with reuseDependentData did not invalidate cache when getting cache across different requests
fixed typo in API code example