User: eaton Branch: DRUPAL-5 Date: Fri, 16 Nov 2007 22:29:40 +0000 Modified files: /modules/token token.inc token.module Log message: Merging token.module with token.inc. The latter is included in almost every situation, and separating them caused problems during the installation time. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/token/token.inc&ol... http://cvs.drupal.org/diff.php?path=contributions/modules/token/token.module...