Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/diaspora.php

1 files changed, 0 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 45e071003..ff6eeccf8 100755
--- a/boot.php
+++ b/boot.php
@@ -2009,7 +2009,6 @@ function load_pdl(&$a) {
 
 		if((! $s) && (($p = theme_include($n)) != ''))
 			$s = @file_get_contents($p);
-
 		if($s) {
 			comanche_parser($a, $s);
 			$a->pdl = $s;