User: setvik Branch: DRUPAL-6--1 Date: Sat, 06 Feb 2010 12:17:28 +0000 Modified files: /modules/subdomain subdomain.module Log message: #651148 by -morbiD- fixes conflict with og patch at http://drupal.org/node/362493#comment-1365582 Links: http://cvs.drupal.org/diff.php?path=contributions/modules/subdomain/subdomai...