User: brucepearson Branch: HEAD Date: Thu, 16 Sep 2010 06:20:53 +0000 Modified files: /modules/translation_management/icl_translate icl_translate.jobs.inc Log message: by brucepearson : fix merge conflicts. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/translation_manage...