User: sun Branch: DRUPAL-5--2 Date: Sat, 06 Nov 2010 17:57:52 +0000 Modified files: /modules/wysiwyg CHANGELOG.txt /modules/wysiwyg/editors/js fckeditor-2.6.js fckeditor.config.js /modules/wysiwyg wysiwyg.module Log message: #855554 by sun: Merged various changes from 3.x into 2.x. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/wysiwyg/CHANGELOG.... http://cvs.drupal.org/diff.php?path=contributions/modules/wysiwyg/editors/js... http://cvs.drupal.org/diff.php?path=contributions/modules/wysiwyg/editors/js... http://cvs.drupal.org/diff.php?path=contributions/modules/wysiwyg/wysiwyg.mo...