User: islandusurper Branch: HEAD Date: Mon, 18 Oct 2010 18:25:10 +0000 Modified files: /modules/ubercart/payment/uc_2checkout uc_2checkout.pages.inc /modules/ubercart/uc_cart uc_cart.rules_defaults.inc /modules/ubercart/uc_file uc_file.admin.inc /modules/ubercart/uc_store uc_store.admin.inc 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/uc_cart/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_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/...