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, 2 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 2e83d371f..559cd8c32 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1361' );
+define ( 'FRIENDICA_VERSION',      '3.0.1362' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1145      );
+define ( 'DB_UPDATE_VERSION',      1147      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );