[contributions(DRUPAL-7--1):franz] /modules/smtp CHANGELOG.txt smtp.module

User: franz Branch: DRUPAL-7--1 Date: Thu, 13 May 2010 13:04:38 +0000 Modified files: /modules/smtp CHANGELOG.txt smtp.module Log message: Resolving CVS conflicts Links: http://cvs.drupal.org/diff.php?path=contributions/modules/smtp/CHANGELOG.txt... http://cvs.drupal.org/diff.php?path=contributions/modules/smtp/smtp.module&o...