User: yched Branch: DRUPAL-6--3 Date: Mon, 03 Jan 2011 15:07:39 +0000 Modified files: /modules/cck CHANGELOG.txt /modules/cck/includes content.token.inc Log message: #986612 by Dave Reid: Token integration - fix variable name clash (harmless in normal cases) Links: http://cvs.drupal.org/diff.php?path=contributions/modules/cck/CHANGELOG.txt&... http://cvs.drupal.org/diff.php?path=contributions/modules/cck/includes/conte...