User: agentken Branch: DRUPAL-6--2 Date: Thu, 29 Apr 2010 21:31:23 +0000 Modified files: /modules/domain CHANGELOG.txt domain.admin.inc /modules/domain/domain_conf domain_conf.admin.inc domain_conf.module /modules/domain/domain_settings domain_settings.module Log message: -- #775224 by antiorario. Domain Conf and Domain Settings interfere with each other. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/domain/CHANGELOG.t... http://cvs.drupal.org/diff.php?path=contributions/modules/domain/domain.admi... http://cvs.drupal.org/diff.php?path=contributions/modules/domain/domain_conf... http://cvs.drupal.org/diff.php?path=contributions/modules/domain/domain_conf... http://cvs.drupal.org/diff.php?path=contributions/modules/domain/domain_sett...