Merge branch 'master' into indexer_improvements

Conflicts:
	inc/fulltext.php
	inc/indexer.php
	lib/exe/indexer.php

1 files changed, 4 insertions, 1 deletions

diff --git a/doku.php b/doku.php
index 1303f1ade..6cd0c0e0c 100644
--- a/doku.php
+++ b/doku.php
@@ -7,7 +7,7 @@
  */
 
 // update message version
-$updateVersion = 29;
+$updateVersion = 30;
 
 //  xdebug_start_profiling();
 
@@ -29,7 +29,10 @@ require_once(DOKU_INC.'inc/init.php');
 //import variables
 $QUERY = trim($_REQUEST['id']);
 $ID    = getID();
+
+// deprecated 2011-01-14
 $NS    = getNS($ID);
+
 $REV   = $_REQUEST['rev'];
 $IDX   = $_REQUEST['idx'];
 $DATE  = $_REQUEST['date'];