Merge branch 'pull'

diff --cc boot.php
index 189eb923aac5f29c76535b9c410a1dc1746a61a5,680ebde55c76aafcb902fc6719741301244d30a9..e1bcc078a587746010c341583a5126ac370f7235
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 b12bd16dab4578ba368229ed57997e326b3adef5,d27945a860d6cdd43ad65a85097047573c3dc4ab..b12bd16dab4578ba368229ed57997e326b3adef5
mode 100755,100644..100644
--- 1/mod/network.php
--- 2/mod/network.php
+++ b/mod/network.php

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