Merge branch 'pull'

diff --cc boot.php
index 189eb92,680ebde..e1bcc07
mode 100755,100644..100644
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '2.3.1302' );
 +define ( 'FRIENDICA_VERSION',      '2.3.1303' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1134      );
+ define ( 'DB_UPDATE_VERSION',      1135      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc mod/network.php
index b12bd16,d27945a..b12bd16
mode 100755,100644..100644
--- 1/mod/network.php
--- 2/mod/network.php
+++ b/mod/network.php

diff --cc util/messages.po
index 6f05609,60c71f7..6f05609
mode 100755,100644..100644
--- 1/util/messages.po
--- 2/util/messages.po
+++ b/util/messages.po