[sakai] svn commit: r72286 - msub/iu.edu/oncourse/trunk/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl

[chmaurer at iupui.edu]

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

Author: chmaurer at iupui.edu
Date: 2010-01-22 09:20:02 -0500 (Fri, 22 Jan 2010)
New Revision: 72286

Modified:
   msub/iu.edu/oncourse/trunk/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
   msub/iu.edu/oncourse/trunk/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
   msub/iu.edu/oncourse/trunk/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
Log:
ONC-1917
Unmerging ONC customization and merging in the community change.

svn merge -c-66203 .
--- Reverse-merging r66203 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java

svn merge -c 66371 https://source.sakaiproject.org/svn/kernel/trunk
--- Merging r66371 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
G    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java

svn log -c 66371 https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------
r66371 | david.horwitz at uct.ac.za | 2009-09-09 07:43:46 -0400 (Wed, 09 Sep 2009) | 1 line

KNL-259
------------------------------------------------------------------------