Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6284)
+++ /CKEditor/trunk/CHANGES.html	(revision 6285)
@@ -66,4 +66,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/6628">#6628</a> : Setting config.enterMode from PHP fails</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6278">#6278</a> : Comments were moving on top of BR tags.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6645">#6645</a> : Allow to configure if &quot; (double quotes) should be encoded in the contents.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/entities/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/entities/plugin.js	(revision 6284)
+++ /CKEditor/trunk/_source/plugins/entities/plugin.js	(revision 6285)
@@ -7,9 +7,9 @@
 {
 	// Base HTML entities.
-	var htmlbase = 'nbsp,gt,lt,quot';
+	var htmlbase = 'nbsp,gt,lt';
 
 	var entities =
 		// Latin-1 Entities
-		'iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +
+		'quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +
 		'not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,' +
 		'cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,' +
@@ -75,5 +75,5 @@
 			});
 
-		if ( !reverse )
+		if ( !reverse && entities )
 		{
 			// Transforms the entities string into an array.