Merge branch 'pull'

diff --cc boot.php
index 143d850a9a79512f0992dd15e8d4329df943950d,6a43806ab6b0fe26f65f53cbfc084d2fce045905..86a37ce90b80c3c41eb7d7f885585be017b138ea
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -6,9 -6,10 +6,10 @@@ require_once('include/plugin.php')
  require_once('include/text.php');
  require_once("include/pgettext.php");
  require_once('include/nav.php');
+ require_once('include/cache.php');
  
  define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
 -define ( 'FRIENDIKA_VERSION',      '2.3.1143' );
 +define ( 'FRIENDIKA_VERSION',      '2.3.1144' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1098      );