User: islandusurper Branch: HEAD Date: Wed, 24 Nov 2010 15:13:43 +0000 Modified files: /modules/ubercart/payment/uc_cybersource uc_cybersource.info uc_cybersource.install uc_cybersource.module /modules/ubercart/shipping/uc_quote uc_quote.pages.inc /modules/ubercart/shipping/uc_shipping uc_shipping.admin.inc /modules/ubercart/uc_cart uc_cart.module /modules/ubercart/uc_store uc_store.admin.inc 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/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/...