User: dopry Branch: DRUPAL-5 Date: Fri, 08 Aug 2008 03:16:25 +0000 Modified files: /modules/daylife daylife.admin.pages.inc daylife.info daylife.install daylife.module daylife.nodes.inc daylife_token.info daylife_views.info Log message: merging from lp:drupal-daylife/1.0 Links: http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife.ad... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife.in... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife.in... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife.mo... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife.no... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife_to... http://cvs.drupal.org/diff.php?path=contributions/modules/daylife/daylife_vi...