User: davereid Branch: DRUPAL-6--1 Date: Sun, 04 Jul 2010 22:06:08 +0000 Modified files: /modules/token token.module Log message: #587148 by Dave Reid, rfay: Added special warning and array merging when more than one module defines the same token. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/token/token.module...