report with source
1
Merge branch 'master' of git://github.com/70838697/YiiooJ

Conflicts:
	protected/components/UUserIdentity.php
1