Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php

1 files changed, 0 insertions, 1 deletions

diff --git a/mod/zfinger.php b/mod/zfinger.php
index fb3333280..fff7c9e1b 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -9,5 +9,4 @@ function zfinger_init(&$a) {
 	$x = zotinfo($_REQUEST);
 	json_return_and_die($x);
 
-
 }