User: islandusurper Branch: HEAD Date: Tue, 14 Sep 2010 13:50:22 +0000 Removed files: /modules/ubercart/uc_store/countries italy_380_2.cif Modified files: /modules/ubercart/shipping/uc_ups uc_ups.admin.inc uc_ups.install uc_ups.module /modules/ubercart/uc_catalog uc_catalog.module /modules/ubercart/uc_store/countries italy_380_3.cif Log message: Merge in 6.x-2.x. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/...