User: sprsquish Branch: DRUPAL-5--2 Date: Fri, 21 Dec 2007 00:25:30 +0000 Modified files: /modules/user_relationships README.txt /modules/user_relationships/plugins/user_relationship_blocks user_relationship_blocks.module /modules/user_relationships/plugins/user_relationship_defaults README.txt user_relationship_defaults.module /modules/user_relationships/plugins/user_relationship_implications README.txt user_relationship_implications.module /modules/user_relationships/plugins/user_relationship_invites README.txt user_relationship_invites.module /modules/user_relationships/plugins/user_relationship_mailer README.txt user_relationship_mailer.install user_relationship_mailer.module /modules/user_relationships/plugins/user_relationship_migrate README.txt user_relationship_migrate.module user_relationship_migrate.mysql /modules/user_relationships user_relationships.install user_relationships.module user_relationships_actions.inc user_relationships_api.inc user_relationships_forms.inc user_relationships_hooks.inc user_relationships_pages.inc user_relationships_theme.inc Log message: Merge from HEAD Links: http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships... http://cvs.drupal.org/diff.php?path=contributions/modules/user_relationships...