User: yhahn Branch: DRUPAL-7--2 Date: Thu, 09 Sep 2010 23:12:09 +0000 Removed files: /modules/diff/includes taxonomy.inc upload.inc Modified files: /modules/diff DiffEngine.php diff.info diff.module diff.pages.inc diff.theme.inc /modules/diff/includes node.inc Log message: Merge from DRUPAL-6--2. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/diff/DiffEngine.ph... http://cvs.drupal.org/diff.php?path=contributions/modules/diff/diff.info&old... http://cvs.drupal.org/diff.php?path=contributions/modules/diff/diff.module&o... http://cvs.drupal.org/diff.php?path=contributions/modules/diff/diff.pages.in... http://cvs.drupal.org/diff.php?path=contributions/modules/diff/diff.theme.in... http://cvs.drupal.org/diff.php?path=contributions/modules/diff/includes/node...