Merge branch 't/10008' into major

Reinmar · Reinmar · commit 376dc4d8a08c · 2013-02-13T19:05:40.000+01:00
diff --git a/core/filter.js b/core/filter.js
@@ -72,6 +72,7 @@
 			// Add editor's default rules.
 			this.allow( 'p br', 1 );
 			this.allow( allowedContent, 1 );
+			this.allow( editor.config.extraAllowedContent, 1 );
 
 			//
 			// Add filter listeners to toHTML and toDataFormat events.
