Index: /CKEditor/branches/versions/3.2.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.2.x/CHANGES.html	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/CHANGES.html	(revision 5344)
@@ -55,7 +55,7 @@
 		Fixed issues:</p>
 	<ul>
-		<li><a href="http://dev.fckeditor.net/ticket/5152">#5152</a> : Indentation using classes didn't work properly.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4682">#4682</a> : It wasn't possible to edit elements in IE that had some styles like width, height or float.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4750">#4750</a> : Corrected default order of buttons in dialogs for Mac.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5152">#5152</a> : Indentation using class attribute doesn't work properly.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4682">#4682</a> : It wasn't possible to edit block elements in IE that had styles like width, height or float.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4750">#4750</a> : Correcting default order of buttons layout in dialogs on Mac.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4932">#4932</a> : Fixed collapse button not clickable on simple toolbar.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5228">#5228</a> : Link dialog is automatically changes protocol when URLs that starts with '?'.</li>
@@ -64,11 +64,11 @@
 		<li><a href="http://dev.fckeditor.net/ticket/3599">#3599</a> : Background color style on sized text displayed as narrow band behind.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4661">#4661</a> : Translation missing in link dialog.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5240">#5240</a> : Flash alignment property is not presented visually.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5240">#5240</a> : Flash alignment property is not presented visually on fake element.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4910">#4910</a> : Pasting in IE scrolls document to the end.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5041">#5041</a> : Table summary attribute can't be removed with dialog.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5124">#5124</a> : All inline styles cannot be set separately for empty spaces.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/3570">#3570</a> : SCAYT marker should not appear in elementspath bar.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5124">#5124</a> : All inline styles cannot be applied on empty spaces.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/3570">#3570</a> : SCAYT marker shouldn't appear inside elements path bar.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4553">#4553</a> : Dirty check result incorrect when editor document is empty.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4555">#4555</a> : Non-released memory when editor is created and destroyed.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4555">#4555</a> : Unreleased memory when editor is created and destroyed.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5118">#5118</a> : Arrow keys navigation in RTL languages is incorrect.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4721">#4721</a> : Remove attribute 'value' of checkbox in IE.</li>
@@ -76,38 +76,38 @@
 		<li><a href="http://dev.fckeditor.net/ticket/5171">#5171</a> : Dialogs contains lists don't have proper voice labels.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4791">#4791</a> : Can't place cusor inside a form that end with a checkbox/radio.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4479">#4479</a> : Style combo doesn't reflect the selection until it's first opened.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4479">#4479</a> : StylesCombo doesn't reflect the selection state until it's first opened.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4717">#4717</a> : 'Unlink' and 'Outdent' command buttons should be disabled on editor startup.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5119">#5119</a> : Disabled command buttons are not being properly marked when focused.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5307">#5307</a> : Hide dialog page cause problem when there's only two remains.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5119">#5119</a> : Disabled command buttons are not being properly styled when focused.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5307">#5307</a> : Hide dialog page cause problem when there's two tab pages remain.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5343">#5343</a> : Active list item ARIA role is wrongly placed.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/3599">#3599</a> : Background color style apply to text with font size been narrowly rendered.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4711">#4711</a> : Line break inside preformatted text make it unable to type text at the end of previous line.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4829">#4829</a> : [IE] Apply style from combo has wrong result on manual created selection.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/3599">#3599</a> : Background color style applying to text with font size style has been narrowly rendered.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4711">#4711</a> : Line break character inside preformatted text make it unable to type text at the end of previous line.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4829">#4829</a> : [IE] Apply style from combo has wrong result on manually created selection.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4830">#4830</a> : Retrieving selected element isn't always right, especially selecting using keyboard (SHIFT+ARROW).</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5128">#5128</a> : Element attribute inside preformatted text is incorrectly corrupted when converting to other blocks.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5190">#5190</a> : Template entry should not gain initial focus in templates list dialog.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5128">#5128</a> : Element attribute inside preformatted text is corrupted when converting to other blocks.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5190">#5190</a> : Template list entry shouldn't gain initial focus open templates list dialog opens.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5238">#5238</a> : Menu button doesn't display arrow icon in high-contrast mode.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/3576">#3576</a> : Non-attributed element of the same name with the applied style is correctly removed.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/3576">#3576</a> : Non-attributed element of the same name with the applied style is incorrectly removed.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5221">#5221</a> : Insert table into empty document cause JavaScript error thrown.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5242">#5242</a> : Apply 'automatic' color option of text color incorrectly removes background-color style.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4719">#4719</a> : IE does not escape attribute values properly.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5170">#5170</a> : Firefox does not insert  text into element properly.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5170">#5170</a> : Firefox does not insert text into styled element properly.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4026">#4026</a> : Office2003 skin has no toolbar button borders in High Contrast in IE7.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4348">#4348</a> : There should have exception thrown when 'CKEDITOR_BASEPATH' could be figured out automatically.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5364">#5364</a> : Focus may not put into dialog correctly when dialog skin file is loading slow.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4016">#4016</a> : justify the layout of forms select dialog in Chrome and IE7.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5373">#5373</a> : fix pathBlockElements wrong items in elementpath.js.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4348">#4348</a> : There should have exception thrown when 'CKEDITOR_BASEPATH' couldn't be figured out automatically.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5364">#5364</a> : Focus may not be put into dialog correctly when dialog skin file is loading slow.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4016">#4016</a> : Justify the layout of forms select dialog in Chrome and IE7.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5373">#5373</a> : Variable 'pathBlockElements' defines wrong items in CKEDITOR.dom.elementPath.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5082">#5082</a> : Ctrl key should be described as Cmd key on Mac.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5182">#5182</a> : Context menu is not been announced correctly by ATs.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/4898">#4898</a> : Can't navigate outside table inside the last paragraph of document.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4898">#4898</a> : Can't navigate outside table under the last paragraph of document.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4950">#4950</a> : List commands could compromise list item attribute and styles.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5018">#5018</a> : Find result highlight remove normal font color styles unintentionally.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5376">#5376</a> : Unable to exit list from within a empty block inside list item.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5018">#5018</a> : Find result highlighting remove normal font color styles unintentionally.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5376">#5376</a> : Unable to exit list from within a empty block under list item.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5145">#5145</a> : Various SCAYT fixes.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5319">#5319</a> : Match whole word doesn't work after replacement happened.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5319">#5319</a> : Match whole word doesn't work anymore after replacement has happened.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5363">#5363</a> : 'title' attribute now presents on all editor iframes.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5374">#5374</a> : Unable to toggle inline style when selection start from the linefeed of the previous paragraph.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4513">#4513</a> : Selected link element is not always correctly detected when using keyboard arrows to perform such selection.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5372">#5372</a> : Newly created sub list should not inheirt nothing from the original (parent) list except list type.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5372">#5372</a> : Newly created sub list should inheirt nothing from the original (parent) list except list type.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5274">#5274</a> : [IE6] Templates preview image is displayed in wrong size.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5292">#5292</a> : Preview in font size and family doesn't work with custom styles.</li>
@@ -124,4 +124,5 @@
 		<li><a href="http://dev.fckeditor.net/ticket/5261">#5261</a> : Config option 'scayt_autoStartup' slow down editor loading.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/3846">#3846</a> : Google Chrome - No Img properties after inserting.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5465">#5465</a> : ShiftEnter=DIV doesn't respect list item when pressing enter at end of list item.</li>
 		<li>Updated the following language files:<ul>
 			<li>Faroese;</li>
Index: /CKEditor/branches/versions/3.2.x/_source/core/editor.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/editor.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/core/editor.js	(revision 5344)
@@ -506,11 +506,4 @@
 				CKEDITOR.tools.removeFunction( this._.filebrowserFn );
 
-			items = this.config.elementsPath_filters;
-			if ( items )
-			{
-				for ( index= 0 ; index < items.length ; index++ )
-					items[ index ] = null;
-			}
-
 			this.fire( 'destroy' );
 			CKEDITOR.remove( this );
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js	(revision 5344)
@@ -45,5 +45,5 @@
 			var idBase = 'cke_elementspath_' + CKEDITOR.tools.getNextNumber() + '_';
 
-			editor._.elementsPath = { idBase : idBase };
+			editor._.elementsPath = { idBase : idBase, filters : [] };
 
 			editor.on( 'themeSpace', function( event )
@@ -57,15 +57,13 @@
 				});
 
-			var filters = editor.config.elementsPath_filters;
-
 			editor.on( 'selectionChange', function( ev )
 				{
-					var env = CKEDITOR.env;
-
-					var selection = ev.data.selection;
-
-					var element = selection.getStartElement(),
+					var env = CKEDITOR.env,
+						selection = ev.data.selection,
+						element = selection.getStartElement(),
 						html = [],
-						elementsList = this._.elementsPath.list = [];
+						editor = ev.editor,
+						elementsList = editor._.elementsPath.list = []
+						filters = editor._.elementsPath.filters;
 
 					while ( element )
@@ -115,7 +113,7 @@
 									' onfocus="event.preventBubble();"' : '' ) +
 									' hidefocus="true" ' +
-									' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', this.name, '\',', index, ', event);"' +
+									' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', editor.name, '\',', index, ', event);"' +
 									extra ,
-									' onclick="return CKEDITOR._.elementsPath.click(\'', this.name, '\',', index, ');"',
+									' onclick="return CKEDITOR._.elementsPath.click(\'', editor.name, '\',', index, ');"',
 									' role="button" aria-labelledby="' + idBase + index + '_label">',
 										name,
@@ -205,15 +203,2 @@
 };
 
-/**
- * A list of filter functions to determinate whether an element should display in elements path bar.
- * @type Array Array of functions that optionaly return 'false' to prevent the element from displaying.
- * @default  []
- * @example
- *	// Prevent elements with attribute 'myAttribute' to appear in elements path.
- *	editor.config.elementsPath_filters.push( function( element )
- *	{
- *		if( element.hasAttribute( 'myAttribute') )
- *			return false;
- *	});
- */
-CKEDITOR.config.elementsPath_filters = [];
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/enterkey/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/enterkey/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/enterkey/plugin.js	(revision 5344)
@@ -101,5 +101,6 @@
 					// a Shift+Enter (#77). Create a new block element instead
 					// (later in the code).
-					if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) )
+					if ( previousBlock.is( 'li' ) ||
+						 !( forceMode || headerTagRegex.test( previousBlock.getName() ) ) )
 					{
 						// Otherwise, duplicate the previous block.
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/list/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/list/plugin.js	(revision 5344)
@@ -39,5 +39,5 @@
 					continue;
 
-				var itemObj = { 'parent' : listNode, indent : baseIndentLevel, element : listItem };
+				var itemObj = { 'parent' : listNode, indent : baseIndentLevel, element : listItem, contents : [] };
 				if ( !grandparentNode )
 				{
@@ -55,8 +55,11 @@
 				for ( var j = 0, itemChildCount = listItem.getChildCount(), child; j < itemChildCount ; j++ )
 				{
-					child = listItem.getChild( j );
-					// Push inner list items with +1 indentation in the correct order.
+					var child = listItem.getChild( j );
 					if ( child.type == CKEDITOR.NODE_ELEMENT && listNodeNames[ child.getName() ] )
+						// Note the recursion here, it pushes inner list items with
+						// +1 indentation in the correct order.
 						CKEDITOR.plugins.list.listToArray( child, database, baseArray, baseIndentLevel + 1, itemObj.grandparent );
+					else
+						itemObj.contents.push( child );
 				}
 			}
@@ -88,5 +91,7 @@
 						retval.append( rootNode );
 					}
-					currentListItem = rootNode.append( item.element );
+					currentListItem = rootNode.append( item.element.clone( false, true ) );
+					for ( var i = 0 ; i < item.contents.length ; i++ )
+						currentListItem.append( item.contents[i].clone( true, true ) );
 					currentIndex++;
 				}
@@ -101,5 +106,5 @@
 					currentListItem;
 					if ( listNodeNames[ item.grandparent.getName() ] )
-						currentListItem = item.element;
+						currentListItem = item.element.clone( false, true );
 					else
 					{
@@ -111,5 +116,6 @@
 					}
 
-					item.element.moveChildren( currentListItem );
+					for ( i = 0 ; i < item.contents.length ; i++ )
+						currentListItem.append( item.contents[i].clone( true, true ) );
 
 					if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/pagebreak/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/pagebreak/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/pagebreak/plugin.js	(revision 5344)
@@ -94,4 +94,9 @@
 			range.splitBlock( 'p' );
 			range.insertNode( breakObject );
+			if ( i == ranges.length - 1 )
+			{
+				range.moveToPosition( breakObject, CKEDITOR.POSITION_AFTER_END );
+				range.select();
+			}
 		}
 	}
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js	(revision 5344)
@@ -622,8 +622,11 @@
 				});
 			}
-
+		},
+
+		afterInit : function( editor )
+		{
 			// Prevent word marker line from displaying in elements path. (#3570)
 			var elementsPathFilters;
-			if ( ( elementsPathFilters = editor.config.elementsPath_filters ) )
+			if ( editor._.elementsPath && ( elementsPathFilters = editor._.elementsPath.filters ) )
 			{
 				elementsPathFilters.push( function( element )
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/styles/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/styles/plugin.js	(revision 5343)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/styles/plugin.js	(revision 5344)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -142,18 +142,20 @@
 
 		// Removes any conflicting styles from within the specified range..
-		removeConflictsFromRange : function ( range )
+		removeConflictsFromRange : function ( range, nodeToPreserve )
 		{
 			var style = this,
-					overrides = getOverrides( style ),
-					styleCandidates = [],
-					overrideCandidates = [];
+				overrides = getOverrides( style ),
+				styleCandidates = [],
+				overrideCandidates = [];
 
 			var walker = new CKEDITOR.dom.walker( range );
 			walker.evaluator = function( node )
 			{
-				if ( node.type == CKEDITOR.NODE_ELEMENT )
+				if ( node.type == CKEDITOR.NODE_ELEMENT
+						&& ( !nodeToPreserve || !node.equals( nodeToPreserve ) ) )
 				{
 					if ( node.is( style.element ) )
 						styleCandidates.push( node );
+
 					if ( node.getName() in overrides )
 						overrideCandidates.push( node );
@@ -408,10 +410,4 @@
 		range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
 		range.trim();
-
-		// Remove all style conflictions within the range,
-		// e.g. style="color:red" is conflicting with style="color:blue".
-		var enlargedBookmark = range.createBookmark();
-		this.removeConflictsFromRange( range );
-		range.moveToBookmark( enlargedBookmark );
 
 		// Get the first node to be processed and the last, which concludes the
@@ -580,6 +576,11 @@
 
 					// Insert it into the range position (it is collapsed after
-					// extractContents.
+					// extractContents).
 					styleRange.insertNode( styleNode );
+
+					// Remove all style conflicts within the range, including
+					// parents boundaries touched by styleNode.
+					styleRange.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+					this.removeConflictsFromRange( styleRange, styleNode );
 
 					// Let's merge our new style with its neighbors, if possible.