Merge branch 'master' of git://github.com/yiisoft/yii.git
Merge branch 'master' of git://github.com/yiisoft/yii.git
* hash() encapsulates path hashing.
* mkdir is now recursive.
* mkdir sets permission instead of chmod.
* indent fixed.
* control flow logic consolidation.
* BC for hash().
* docblock
* copyDirectory creates dstDir recursively.
* recursive dst creation at copyDirectory.
* dir access mode is set by chmod, again (note: if dst is created recursively, then only last dir will have newDirMode access).
* CSC
- umask removed.
- @ silence operator removed.
* CHANGELOG updated
Fixed #1499 CVarDumper error in highlighting "\"
Changed Bug #1499 position
Merge branch 'master' of git://github.com/yiisoft/yii into 1499-fix-cvardumper-highlighting
Merge branch 'master' of git://github.com/yiisoft/yii into 1499-fix-cvardumper-highlighting
Merge branch 'CFileHelper_recursive_copy_fix' of git://github.com/innsand/yii into innsand-CFileHelper_recursive_copy_fix
Merge branch 'master' of git://github.com/yiisoft/yii

Conflicts:
	CHANGELOG
+ CFileHelperTest
* newDirMode correctly setted on recursive creation of dst dir.
Merge remote-tracking branch 'upstream/master' into asset_manager_hash_refactoring

Conflicts:
	CHANGELOG
	framework/web/CAssetManager.php