User: agentken Branch: HEAD Date: Fri, 23 Oct 2009 16:33:21 +0000 Modified files: /modules/domain CHANGELOG.txt /modules/domain/domain_conf domain_conf.admin.inc Log message: -- #612808 patch by voxpelli. Cannot use array_merge() with Domain Conf defaults. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/domain/CHANGELOG.t... http://cvs.drupal.org/diff.php?path=contributions/modules/domain/domain_conf...