merge hotfix; updated changelog

CHANGELOG.md

@@ -3,7 +3,7 @@
 This document is to serve as a "what has been done" in terms of the [Roadmap](http://aloha-editor.org/wiki/Roadmap)
 
 ## 0.20.4 - SNAPSHOT
-
+- word contenthandler: cleanup for pasted word documents with table of contents
 
 ## 0.20.3 - 2012/01/24
 - image-plugin: The imageplugin will now only display the crop buttons when the cropping area selection was finished. This avoids a bug in Internet Explorer 7 where the crop area could not be resized once the user entered those crop buttons.