Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge remote-tracking branch 'upstream/master'
CFileValidator is no longer unsafe by default

CFileValidator is no longer unsafe by default to prevent setting
arbitrary values. Instead, when no file is uploaded attribute is set to
null (marcovtwout)
Merge pull request #3197 from marcovtwout/1257-fix-CFileValidator-safe-mass-assignment

1257 fix c file validator safe mass assignment