[sakai] svn commit: r70794 - osp/branches/sakai-2.7.x osp/branches/sakai-2.7.x/presentation/tool/src/bundle/org/theospi/portfolio/presentation/bundle osp/branches/sakai-2.7.x/presentation/tool/src/java/org/theospi/portfolio/presentation/control osp/branches/sakai-2.7.x/presentation/tool/src/java/org/theospi/portfolio/presentation/support osp/branches/sakai-2.7.x/presentation/tool/src/webapp/WEB-INF osp/branches/sakai-2.7.x/presentation/tool/src/webapp/WEB-INF/jsp/presentation reference/branches/sakai-2.7.x reference/branches/sakai-2.7.x/docs

[bkirschn at umich.edu]

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

Author: bkirschn at umich.edu
Date: 2009-12-21 15:44:11 -0500 (Mon, 21 Dec 2009)
New Revision: 70794

Modified:
   osp/branches/sakai-2.7.x/
   osp/branches/sakai-2.7.x/presentation/tool/src/bundle/org/theospi/portfolio/presentation/bundle/Messages.properties
   osp/branches/sakai-2.7.x/presentation/tool/src/java/org/theospi/portfolio/presentation/control/CreatePresentationController.java
   osp/branches/sakai-2.7.x/presentation/tool/src/java/org/theospi/portfolio/presentation/control/ListPresentationController.java
   osp/branches/sakai-2.7.x/presentation/tool/src/java/org/theospi/portfolio/presentation/support/PresentationService.java
   osp/branches/sakai-2.7.x/presentation/tool/src/webapp/WEB-INF/jsp/presentation/createPresentation.jsp
   osp/branches/sakai-2.7.x/presentation/tool/src/webapp/WEB-INF/jsp/presentation/listPresentation.jsp
   osp/branches/sakai-2.7.x/presentation/tool/src/webapp/WEB-INF/presentation-web-config.xml
   reference/branches/sakai-2.7.x/
   reference/branches/sakai-2.7.x/docs/sakai.properties
Log:
SAK-17598 svn merge -c 69931 https://source.sakaiproject.org/svn/osp/trunk