Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  zrl's when visiting public photos at the source site
  doco
  cleanup
  turn "follow" into a function
  add hometown to profiles
  bug #439 - remove web port number from notification email "from" address
  webfinger profile linker
  "howlong" added to marital status.
  fewer "bob smith to bob smith via wall-to-wall".
  [quote=somebody] was appearing as an extended spoiler tag.

* master:

1 files changed, 16 insertions, 0 deletions

diff --git a/mod/acctlink.php b/mod/acctlink.php
new file mode 100644
index 000000000..a2365803a
--- /dev/null
+++ b/mod/acctlink.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once('include/Scrape.php');
+
+function acctlink_init(&$a) {
+
+	if(x($_GET,'addr')) {
+		$addr = trim($_GET['addr']);
+		$res = probe_url($addr);
+		//logger('acctlink: ' . print_r($res,true));
+		if($res['url']) {
+			goaway($res['url']);
+			killme();
+		}
+	}
+}