Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php

1 files changed, 0 insertions, 11 deletions

diff --git a/index.php b/index.php
index 8fca9d2c9..a13d22d8c 100755
--- a/index.php
+++ b/index.php
@@ -198,21 +198,10 @@ if(strlen($a->module)) {
 
 	if(! $a->module_loaded) {
 
-		/* 
-		 * Traditionally we looked in custom first, but we're leaning toward a convention where site
-		 * specific things are all in directories called 'site'. So custom will be going away.
-		 * There are a very small number of folks affected. You know who you are. Once you've got things sorted,
-		 * please remove the lines for "custom/" and push to the project repository.  
-		 */
-
 		if(file_exists("mod/site/{$a->module}.php")) {
 			include_once("mod/site/{$a->module}.php");
 			$a->module_loaded = true;
 		}
-		elseif(file_exists("custom/{$a->module}.php")) {
-			include_once("custom/{$a->module}.php");
-			$a->module_loaded = true;
-		}
 		elseif(file_exists("mod/{$a->module}.php")) {
 			include_once("mod/{$a->module}.php");
 			$a->module_loaded = true;