Merge branch 'master' into stable

Conflicts:
	data/deleted.files
	doku.php
	lib/exe/xmlrpc.php

1 files changed, 4 insertions, 2 deletions

diff --git a/install.php b/install.php
index ef3c848a9..27f888523 100644
--- a/install.php
+++ b/install.php
@@ -46,7 +46,8 @@ $dokuwiki_hash = array(
     '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
     '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
     '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
-    '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8'
+    '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
+    'rc2011-04-22' => '4241865472edb6fa14a1227721008072',
 );
 
 
@@ -460,7 +461,8 @@ function check_functions(){
                          'glob header ignore_user_abort ini_get mail mkdir '.
                          'ob_start opendir parse_ini_file readfile realpath '.
                          'rename rmdir serialize session_start unlink usleep '.
-                         'preg_replace file_get_contents htmlspecialchars_decode');
+                         'preg_replace file_get_contents htmlspecialchars_decode '.
+                         'spl_autoload_register');
 
     if (!function_exists('mb_substr')) {
         $funcs[] = 'utf8_encode';