Merge branch 'master' into spam

2 files changed, 3 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 9b192853c..fc53a026d 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1242' );
+define ( 'FRIENDICA_VERSION',      '2.3.1243' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1119      );
 
diff --git a/include/expire.php b/include/expire.php
index 7608b9054..5fa0ec758 100755
--- a/include/expire.php
+++ b/include/expire.php
@@ -29,10 +29,10 @@ function expire_run($argv, $argc){
 	$a->set_baseurl(get_config('system','url'));
 
 
-	// physically remove anything that has been deleted from more than two months
+	// physically remove anything that has been deleted for more than two months
 
 	$r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
-
+	q("optimize table item");
 
 	logger('expire: start');