User: islandusurper Branch: HEAD Date: Tue, 28 Sep 2010 20:29:46 +0000 Modified files: /modules/ubercart/payment/uc_credit uc_credit.module /modules/ubercart/payment/uc_paypal uc_paypal.module uc_paypal.pages.inc /modules/ubercart/uc_attribute uc_attribute.admin.inc /modules/ubercart/uc_cart uc_cart.module /modules/ubercart/uc_order uc_order.order_pane.inc /modules/ubercart/uc_product uc_product.module /modules/ubercart/uc_store/countries macao_446_1.cif moldova_498_1.cif virgin_islands_british_92_1.cif virgin_islands_us_850_1.cif Log message: Merge in 6.x-2.x. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/...