[sakai] svn commit: r96410 - in msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/announcement: . announcement-impl/impl/src/java/org/sakaiproject/announcement/entity announcement-impl/pack/src/webapp/WEB-INF

[chmaurer at iupui.edu]

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

Author: chmaurer at iupui.edu
Date: 2011-08-04 16:28:49 -0400 (Thu, 04 Aug 2011)
New Revision: 96410

Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/announcement/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/announcement/announcement-impl/impl/src/java/org/sakaiproject/announcement/entity/AnnouncementEntityProviderImpl.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2011-08-11/announcement/announcement-impl/pack/src/webapp/WEB-INF/components.xml
Log:
svn merge -c96399 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/sakai-2.7.1/announcement
--- Merging r96399 into '.':
U    announcement-impl/impl/src/java/org/sakaiproject/announcement/entity/AnnouncementEntityProviderImpl.java
U    announcement-impl/pack/src/webapp/WEB-INF/components.xml

svn log -c96399 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/sakai-2.7.1/announcement
------------------------------------------------------------------------
r96399 | chmaurer at iupui.edu | 2011-08-04 15:19:13 -0400 (Thu, 04 Aug 2011) | 2 lines

ONC-4079
Combine the two providers, using the "better" one that we already had as the base.
------------------------------------------------------------------------