Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
Update database.dao.txt
Merge pull request #3194 from tomekbyd/patch-1

Update database.dao.txt
Update database.arr.txt
Merge pull request #3195 from tomekbyd/patch-2

Update database.arr.txt
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
Adding support for the X-HTTP-Method-Override header.
Adding changelog info about support for the X-HTTP-Method-Override header.
Update CHANGELOG
Update CHANGELOG
Update CHANGELOG
Merge pull request #3202 from infoza/master

Adding support for the X-HTTP-Method-Override header.
one more revert.
Revert "one more revert."

This reverts commit 91787e87872a114da3694067e5618b0c70446687.
#3077
Merge origin/master
changelog for #3077