User: islandusurper Branch: HEAD Date: Thu, 15 Jul 2010 20:32:40 +0000 Modified files: /modules/ubercart/ca ca.ca.inc /modules/ubercart/payment/uc_2checkout uc_2checkout.install uc_2checkout.pages.inc /modules/ubercart/payment/uc_authorizenet uc_authorizenet.admin.inc uc_authorizenet.install uc_authorizenet.pages.inc /modules/ubercart/payment/uc_credit uc_credit.admin.inc uc_credit.pages.inc /modules/ubercart/payment/uc_cybersource uc_cybersource.install uc_cybersource.module uc_cybersource.soap.inc /modules/ubercart/payment/uc_google_checkout uc_google_checkout.admin.inc uc_google_checkout.pages.inc /modules/ubercart/payment/uc_payment uc_payment.admin.inc uc_payment.js uc_payment_order_pane.inc /modules/ubercart/payment/uc_payment_pack uc_payment_pack.admin.inc uc_payment_pack.module /modules/ubercart/shipping/uc_flatrate uc_flatrate.admin.inc /modules/ubercart/shipping/uc_quote uc_quote.admin.inc uc_quote.pages.inc /modules/ubercart/shipping/uc_shipping uc_shipping.admin.inc uc_shipping.install /modules/ubercart/shipping/uc_ups uc_ups.admin.inc /modules/ubercart/shipping/uc_usps uc_usps.admin.inc /modules/ubercart/shipping/uc_weightquote uc_weightquote.admin.inc /modules/ubercart/uc_attribute uc_attribute.admin.inc /modules/ubercart/uc_cart uc_cart.api.php uc_cart.module uc_cart_checkout_pane.inc /modules/ubercart/uc_catalog uc_catalog.admin.inc uc_catalog.pages.inc /modules/ubercart/uc_file uc_file.ca.inc uc_file.pages.inc /modules/ubercart/uc_googleanalytics uc_googleanalytics.module /modules/ubercart/uc_order uc_order.ca.inc uc_order.line_item.inc /modules/ubercart/uc_product uc_product.admin.inc uc_product.module uc_product.pages.inc /modules/ubercart/uc_product_kit uc_product_kit.admin.inc /modules/ubercart/uc_reports uc_reports.module /modules/ubercart/uc_roles uc_roles.admin.inc uc_roles.ca.inc uc_roles.install uc_roles.module /modules/ubercart/uc_stock uc_stock.admin.inc uc_stock.module /modules/ubercart/uc_stock/views uc_stock.views.inc /modules/ubercart/uc_store/includes summaries.inc summaries.js tapir.inc uc_price.inc /modules/ubercart/uc_store uc_store.admin.inc uc_store.install uc_store.module /modules/ubercart/uc_tax_report uc_tax_report.module Log message: Merge in 6.x-2.x. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/ca/ca.ca.... 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/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/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/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/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/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_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_cart/u... 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_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_google... 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_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... 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/... 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_tax_re...