Learn more about cloning repositories
You have read-only access
[svn-r25471] merge from trunk and resolve conflicts.
