dhorwitz@david-horwitz:~/branchManagement/sakai-2.8.x/reference> svn log
-r93864 https://source.sakaiproject.org/svn/reference/trunk                                               
------------------------------------------------------------------------                                                                                                            
r93864 | matthew.buckett@oucs.ox.ac.uk | 2011-06-17 15:19:40 +0200 (Fri,
17 Jun 2011) | 1 line                                                                                      
                                                                                                                                                                                    
SAK-20700 Resize multiple iframes so that when /access/content URLs are
inside a Web Content tool (2 iframes) they are both resized when the
content changes.                       
------------------------------------------------------------------------                                                                                                            
dhorwitz@david-horwitz:~/branchManagement/sakai-2.8.x/reference> svn
merge -c93864 https://source.sakaiproject.org/svn/reference/trunk                                              
--- Merging r93864 into 'library':                                                                                                                                                  
A    library/src/webapp/js/access.js             


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@106524 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21315 merge trunk r101625

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@106859 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22052 - 2.8.x skin for CLE tools embedded in OAE - merge from SAKIII-5329 branch of reference

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@106880 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21681 manually merged in r104849, r104851, r105438

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@107299 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-19280 svn merge -c 104263 Turkish translations

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@107719 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21396 merge trunk r111043

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@111044 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21214 - Merge CKEditor upgrade (3.6.2) to 2.8.x


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@112107 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21053 merge trunk r103406

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118533 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21374 merge trunk r103413

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118606 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21610 merge trunk r108262

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118608 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22058 merge trunk r108739

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118611 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22505 merge trunk r112000

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118625 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23164 merge trunk r118781 - but had to create the file first

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

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118793 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23179 update the SQL conversion scripts for 2.8.3 release

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@119122 66ffb92e-73f9-0310-93c1-f5514f145a0a
WL-2789 Upgrade CKEditor to 3.6.2

This fixes the problem of not being able to paste in source view from IE9.

Merge remote-tracking branch 'mirror/sakai-2.8.x' into sakai-2.8.x

Conflicts:
	library/src/webapp/js/access.js