[contributions:islandusurper] /modules/ubercart/ca ca.admin.inc /modules/ubercart/uc_roles uc_roles.install uc_roles.module

User: islandusurper Branch: HEAD Date: Mon, 15 Mar 2010 13:41:31 +0000 Modified files: /modules/ubercart/ca ca.admin.inc /modules/ubercart/uc_roles uc_roles.install uc_roles.module Log message: Merge changes from 6.x-2.x: [#699422] by RSTaylor: Incorrect parameter passed to uc_roles_delete(). [#587830] by Island Usurper: Change order of Add/Save buttons on CA add condition form [#729934] by AlexisWilke: Remove roles from uc_product_features table when uninstalling uc_roles Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/ca/ca.adm... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/...