Merge remote-tracking branch 'upstream/master'

Update
2013-08-21 22:19:38 +02:00
parent a944a879b1 d8ef1417fb
commit 056ed00a4c
21 changed files with 7854 additions and 10285 deletions
--- a/boot.php
+++ b/boot.php
@@ -43,7 +43,7 @@ require_once('include/taxonomy.php');
 define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
-define ( 'DB_UPDATE_VERSION',       1059  );
+define ( 'DB_UPDATE_VERSION',       1063  );

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