[gh-176] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@903 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/includes/common.php

@@ -73,6 +73,10 @@ function unl_get_site_settings($uri) {
     throw new Exception('No settings.php exists for site at ' . $uri);
   }
   
+  if (is_readable(DRUPAL_ROOT . '/sites/all/settings.php')) {
+    require DRUPAL_ROOT . '/sites/all/settings.php';
+  }
+  
   require $settings_file;
   unset($uri);
   unset($settings_file);