Merge remote-tracking branch 'upstream/master'

2013-06-07 03:46:43 +01:00
parent dc6472e046 c21f8c68e3
commit 466a6d5227
82 changed files with 1154 additions and 691 deletions
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ require_once('include/features.php');
 define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
-define ( 'DB_UPDATE_VERSION',       1042  );
+define ( 'DB_UPDATE_VERSION',       1043  );

 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );