User: darrick Branch: DRUPAL-6--2 Date: Thu, 20 Jan 2011 23:29:45 +0000 Modified files: /modules/merci merci.module /modules/merci/tests merci.test Log message: Fixed issue with conflicts for canceled reservations containing unassigned bucket items. Fixed issue with the number of bucket items shown in the conflict grid. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/tests/merci....