SAK-22424 merge r110843 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@111173 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22463 merge r111129 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@111174 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22472 merge r111183 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@111186 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-760 merge trunk r112068

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@112069 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22465 merge r111139 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@112292 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22470 merge r111168 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@112293 66ffb92e-73f9-0310-93c1-f5514f145a0a
2.9.x merge

svn merge -c112383 -c112384 -c112385 https://source.sakaiproject.org/svn/emailtemplateservice/trunk/
--- Merging r112383 into '.':
U    impl/logic/src/test/org/sakaiproject/emailtemplateservice/logic/test/TestEmailTemplateService.java
U    impl/logic/src/java/org/sakaiproject/emailtemplateservice/service/impl/EmailTemplateServiceImpl.java
U    api/src/java/org/sakaiproject/emailtemplateservice/model/EmailTemplate.java
--- Merging r112384 into '.':
U    tool/src/webapp/templates/main.html
--- Merging r112385 into '.':
G    impl/logic/src/test/org/sakaiproject/emailtemplateservice/logic/test/TestEmailTemplateService.java
G    impl/logic/src/java/org/sakaiproject/emailtemplateservice/service/impl/EmailTemplateServiceImpl.java

svn log -c112383 -c112384 -c112385 https://source.sakaiproject.org/svn/emailtemplateservice/trunk/
------------------------------------------------------------------------
r112383 | david.horwitz@uct.ac.za | 2012-09-13 04:28:45 -0400 (Thu, 13 Sep 2012) | 2 lines

SAK-22223 don't use a null for locale

------------------------------------------------------------------------
r112384 | david.horwitz@uct.ac.za | 2012-09-13 05:04:18 -0400 (Thu, 13 Sep 2012) | 1 line

SAK-22223 Add the styles to the the page
------------------------------------------------------------------------
r112385 | david.horwitz@uct.ac.za | 2012-09-13 05:13:15 -0400 (Thu, 13 Sep 2012) | 1 line

SAK-22223 make sure the template locale is not empty
------------------------------------------------------------------------

svn merge -c112450 https://source.sakaiproject.org/svn/reference/trunk/
Conflict discovered in 'docs/conversion/sakai_2_9_0_oracle_conversion.sql'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r112450 into '.':
U    docs/conversion/sakai_2_9_0_oracle_conversion.sql
Conflict discovered in 'docs/conversion/sakai_2_9_0_mysql_conversion.sql'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
U    docs/conversion/sakai_2_9_0_mysql_conversion.sql

svn log -c112450 https://source.sakaiproject.org/svn/reference/trunk/
------------------------------------------------------------------------
r112450 | david.horwitz@uct.ac.za | 2012-09-14 09:35:54 -0400 (Fri, 14 Sep 2012) | 2 lines

SAK-22223 add conversions

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



git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113208 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22656 - Merging wordcount fix from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113260 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-952 merge r111513,r111516 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113287 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22467 merge r111149 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113349 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22489 merge r111780,r111781 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113351 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22449 merge r111047 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113353 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22468 merge r111799,r111802 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113359 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22505 merge r 112000 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113361 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22540 merge r112138 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113363 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22456 merge r111098 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113368 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22613 merge r112467 from trunk


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113376 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22632 merge r113058 from trunk 

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113386 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22644 merge r113184 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113388 66ffb92e-73f9-0310-93c1-f5514f145a0a
2.9.x merge

svn merge -c110754 https://source.sakaiproject.org/svn/reference/trunk/
--- Merging r110754 into 'library':
U    library/src/webapp/editor/ckextraplugins/atd-ckeditor/plugin.js

svn log -c110754 https://source.sakaiproject.org/svn/reference/trunk/
------------------------------------------------------------------------
r110754 | matthew@longsight.com | 2012-07-25 17:12:05 -0400 (Wed, 25 Jul 2012) | 2 lines

SAK-22412 - ATD plugin doesn't remove markup when saving

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



git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@113395 66ffb92e-73f9-0310-93c1-f5514f145a0a