User: islandusurper Branch: HEAD Date: Tue, 02 Nov 2010 20:51:05 +0000 Modified files: /modules/ubercart/payment/uc_credit uc_credit.admin.inc uc_credit.module /modules/ubercart/shipping/uc_usps uc_usps.module /modules/ubercart/uc_attribute uc_attribute.module uc_attribute.test /modules/ubercart/uc_cart uc_cart_checkout_pane.inc /modules/ubercart/uc_catalog uc_catalog.pages.inc /modules/ubercart/uc_order uc_order.js uc_order.module uc_order.order_pane.inc /modules/ubercart/uc_product uc_product.test /modules/ubercart/uc_store uc_store.module 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/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... 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_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... 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/...