User: deviantintegral Branch: HEAD Date: Wed, 10 Dec 2008 17:29:50 +0000 Modified files: /modules/resource_conflict .cvsignore LICENSE.txt README.txt resource_conflict.info resource_conflict.install resource_conflict.module Log message: Merging DRUPAL-5--2 back to HEAD for Drupal 6 branch. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/... http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/... http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/... http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/... http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/... http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/...