User: islandusurper Branch: HEAD Date: Thu, 01 Apr 2010 18:43:41 +0000 Modified files: /modules/ubercart/payment/uc_cybersource uc_cybersource.module /modules/ubercart/payment/uc_paypal uc_paypal.module /modules/ubercart/uc_attribute uc_attribute.install /modules/ubercart/uc_cart uc_cart.install /modules/ubercart/uc_cart_links uc_cart_links.install /modules/ubercart/uc_stock uc_stock.install Log message: Merge 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/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_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/...