[sakai] svn commit: r93997 - in msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam: . docs docs/conversion samigo-app samigo-app/src/java/org/sakaiproject/tool/assessment/bundle samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation samigo-app/src/webapp/jsf/evaluation samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging

[chmaurer at iupui.edu]

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

Author: chmaurer at iupui.edu
Date: 2011-06-23 09:49:34 -0400 (Thu, 23 Jun 2011)
New Revision: 93997

Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/docs/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/docs/conversion/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-app/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorImportExport.properties
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/HistogramQuestionScoresBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-app/src/webapp/jsf/evaluation/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/sam/samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging/
Log:
svn merge -c 93959 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/sakai-2.7.1/sam      
--- Merging r93959 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorImportExport.properties

svn log -c 93959 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/sakai-2.7.1/sam
------------------------------------------------------------------------
r93959 | shaknooh at indiana.edu | 2011-06-22 14:39:06 -0400 (Wed, 22 Jun 2011) | 2 lines

ONC-3600

------------------------------------------------------------------------