User: darrick Branch: DRUPAL-6--2 Date: Thu, 17 Feb 2011 19:53:47 +0000 Modified files: /modules/merci merci.module /modules/merci/theme theme.inc Log message: Fixed issue #1064724 Fixed incorrect handling of timezone (DST) 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/theme/theme....