User: dman Branch: DRUPAL-6--1 Date: Thu, 03 Feb 2011 02:38:56 +0000 Modified files: /modules/import_html/modules content.inc Log message: small conflict with cck field imports - don't overwrite if a custom module has set it. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/module...