Merge branch 'master' into yii-user-compat
Merge branch 'yii-user-compat' of git://github.com/nineinchnick/yii-usr into yii-user-compat
Merge branch 'master' into yii-user-compat
Merge branch 'yii-user-compat' of git://github.com/nineinchnick/yii-usr into yii-user-compat
Merge branch 'yii-user-compat' of git://github.com/nineinchnick/yii-usr into yii-user-compat
Merge branch 'yii-user-compat' of git://github.com/nineinchnick/yii-usr into yii-user-compat