Merge branch 'pull'

diff --cc boot.php
index eeaf00f1a01a20bc0d76e611708edbe49d56b947,555d2405c19fb28d5d5df9683975e759d6693329..1364385a1b12863ad388e0e23ed2d43862b2dfc2
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -4,9 -4,9 +4,9 @@@ set_time_limit(0)
  ini_set('pcre.backtrack_limit', 250000);
  
  
 -define ( 'FRIENDIKA_VERSION',      '2.2.1015' );
 +define ( 'FRIENDIKA_VERSION',      '2.2.1016' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1063      );
+ define ( 'DB_UPDATE_VERSION',      1064      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );