Merge branch 'imap'

diff --cc boot.php
index 73f457980bc7b78886431434941e275df790cde1,9072a135d205049c84f524de3aa347a0f6b373c7..f06ad13e644a98868f3fce0d97270527c60f3272
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -2,9 -2,9 +2,9 @@@
  
  set_time_limit(0);
  
 -define ( 'FRIENDIKA_VERSION',      '2.1.950' );
 +define ( 'FRIENDIKA_VERSION',      '2.1.951' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1052      );
+ define ( 'DB_UPDATE_VERSION',      1053      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );