User: agentken Branch: DRUPAL-5--2 Date: Sat, 22 Dec 2007 02:04:55 +0000 Modified files: /modules/mysite CHANGELOG.txt mysite.install /modules/mysite/plugins/formats teasers.theme Log message: fixes changelog merge issue Links: http://cvs.drupal.org/diff.php?path=contributions/modules/mysite/CHANGELOG.t... http://cvs.drupal.org/diff.php?path=contributions/modules/mysite/mysite.inst... http://cvs.drupal.org/diff.php?path=contributions/modules/mysite/plugins/for...