Merge branch 'master' of git://github.com/yiisoft/yii into
#2778_BUG_CFileValidator_General_exception_when_validating_MIME_types_for_file_whose_upload_failed_due_to_file_size

Conflicts:
	CHANGELOG