User: islandusurper Branch: HEAD Date: Wed, 11 Aug 2010 20:12:58 +0000 Modified files: /modules/ubercart/payment/uc_2checkout uc_2checkout.module uc_2checkout.pages.inc /modules/ubercart/payment/uc_google_checkout uc_google_checkout.pages.inc /modules/ubercart/payment/uc_paypal uc_paypal.module uc_paypal.pages.inc /modules/ubercart/shipping/uc_shipping uc_shipping.admin.inc uc_shipping.module /modules/ubercart/uc_cart uc_cart.module /modules/ubercart/uc_cart_links uc_cart_links.admin.inc uc_cart_links.install uc_cart_links.pages.inc /modules/ubercart/uc_order uc_order.module /modules/ubercart/uc_product/views uc_product_handler_field_price.inc uc_product_handler_field_weight.inc Log message: Merge in changes from 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/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_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... 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_produc...