[sakai] svn commit: r90025 - in profile2/branches/profile2-1.4.x: . api/src/java/org/sakaiproject/profile2/logic api/src/java/org/sakaiproject/profile2/util bundle/src/resources docs/database/mysql docs/database/oracle impl/src/java/org/sakaiproject/profile2/logic tool/src/java/org/sakaiproject/profile2/tool/pages tool/src/java/org/sakaiproject/profile2/tool/pages/panels

[steve.swinsburg at gmail.com]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=90025

Author: steve.swinsburg at gmail.com
Date: 2011-03-18 07:23:36 -0400 (Fri, 18 Mar 2011)
New Revision: 90025

Modified:
   profile2/branches/profile2-1.4.x/
   profile2/branches/profile2-1.4.x/api/src/java/org/sakaiproject/profile2/logic/ProfileConnectionsLogic.java
   profile2/branches/profile2-1.4.x/api/src/java/org/sakaiproject/profile2/logic/ProfilePrivacyLogic.java
   profile2/branches/profile2-1.4.x/api/src/java/org/sakaiproject/profile2/util/ProfileConstants.java
   profile2/branches/profile2-1.4.x/bundle/src/resources/ProfileApplication.properties
   profile2/branches/profile2-1.4.x/bundle/src/resources/ProfileApplication_en_AU.properties
   profile2/branches/profile2-1.4.x/bundle/src/resources/ProfileApplication_en_GB.properties
   profile2/branches/profile2-1.4.x/bundle/src/resources/ProfileApplication_en_US.properties
   profile2/branches/profile2-1.4.x/bundle/src/resources/ProfileApplication_in_ID.properties
   profile2/branches/profile2-1.4.x/docs/database/mysql/profile2-conversion-1.3-1.4-mysql.sql
   profile2/branches/profile2-1.4.x/docs/database/oracle/profile2-conversion-1.3-1.4-oracle.sql
   profile2/branches/profile2-1.4.x/impl/src/java/org/sakaiproject/profile2/logic/ProfileConnectionsLogicImpl.java
   profile2/branches/profile2-1.4.x/impl/src/java/org/sakaiproject/profile2/logic/ProfilePrivacyLogicImpl.java
   profile2/branches/profile2-1.4.x/tool/src/java/org/sakaiproject/profile2/tool/pages/MyPrivacy.java
   profile2/branches/profile2-1.4.x/tool/src/java/org/sakaiproject/profile2/tool/pages/panels/ComposeNewMessage.java
Log:
PRFL-593 merge trunk r90013, r90014, r90015