User: darrick Branch: DRUPAL-6--2 Date: Thu, 08 Jul 2010 00:45:48 +0000 Modified files: /modules/merci merci.module Log message: Fixed issue with local timezone offset disrupting the conflict grid. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module...