svn merge -c86090 https://source.sakaiproject.org/contrib/assignment2/trunk
--- Merging r86090 into '.':
U    impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentItemImpl.java
U    impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentActivityProducerImpl.java
U    bundle/messages.properties
U    tool/src/java/org/sakaiproject/assignment2/tool/LocalPermissionLogic.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnSubmitEditorRenderer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/StudentViewAssignmentRenderer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnTagsRenderer.java
D    tool/src/java/org/sakaiproject/assignment2/tool/producers/FinishUiModalProducer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/GradeProducer.java
U    tool/src/webapp/WEB-INF/requestContext.xml
U    tool/src/webapp/content/css/assignmentsv4.css
U    tool/src/webapp/content/js/thickbox.js
D    tool/src/webapp/content/templates/finish-ui-modal.html
U    tool/src/webapp/component-templates/AssignmentTags.html
------------------------------------------------------------------------
r86090 | dsobiera@indiana.edu | 2014-04-14 11:15:43 -0700 (Mon, 14 Apr 2014) | 1 line

ASNN-825 - reverted osp work -r84835
------------------------------------------------------------------------


git-svn-id: https://source.sakaiproject.org/contrib/assignment2/branches/sakai-10.x@86445 fdecad78-55fc-0310-b1b2-d7d25cf747c9