[sakai] svn commit: r86964 - in content/branches/sakai-2.8.x: . content-tool/tool/src/java/org/sakaiproject/content/tool content-types/src/java/org/sakaiproject/content/types

[arwhyte at umich.edu]

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

Author: arwhyte at umich.edu
Date: 2011-01-10 10:18:36 -0500 (Mon, 10 Jan 2011)
New Revision: 86964

Modified:
   content/branches/sakai-2.8.x/
   content/branches/sakai-2.8.x/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
   content/branches/sakai-2.8.x/content-types/src/java/org/sakaiproject/content/types/
Log:
SAK-19789 merge trunk r86953