User: itarato Branch: DRUPAL-6--1 Date: Thu, 25 Feb 2010 15:21:59 +0000 Added files: /modules/bubbletimer bubbletimer-global.css bubbletimer.api.inc bubbletimer.test /modules/bubbletimer/bubbletimer_form_feature bubbletimer_form_feature.defaults.inc bubbletimer_form_feature.features.inc bubbletimer_form_feature.info bubbletimer_form_feature.module clock.png style.css /modules/bubbletimer/bubbletimer_group_report bubbletimer_group_report.info bubbletimer_group_report.module /modules/bubbletimer/bubbletimer_group_total bubbletimer_group_total.defaults.inc bubbletimer_group_total.features.inc bubbletimer_group_total.features.node.inc bubbletimer_group_total.features.views.inc bubbletimer_group_total.info bubbletimer_group_total.module style.css /modules/bubbletimer/bubbletimer_time_management bubbletimer_time_management.defaults.inc bubbletimer_time_management.features.inc bubbletimer_time_management.info bubbletimer_time_management.module clock.png style.css /modules/bubbletimer clock.png Modified files: /modules/bubbletimer bubbletimer-form.css bubbletimer.admin.inc bubbletimer.info bubbletimer.install bubbletimer.js bubbletimer.module bubbletimer.page.inc bubbletimer.slot.inc bubbletimer.statistics.inc bubbletimer.user.inc bubbletimer_history.js bubbletimer_page.tpl.php bubbletimer_statistics.js Log message: Ugly merge from the 6-2-X branch. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/clock.... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble... http://cvs.drupal.org/diff.php?path=contributions/modules/bubbletimer/bubble...