Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle

Conflicts:
	version.php

diff --cc files/renderer.php
Simple merge

diff --cc lang/en/moodle.php
Simple merge

diff --cc lib/filelib.php
Simple merge

diff --cc lib/form/dndupload.js
Simple merge

diff --cc lib/form/filemanager.js
Simple merge

diff --cc repository/draftfiles_manager.php
Simple merge

diff --cc repository/filepicker.js
Simple merge

diff --cc repository/filepicker.php
Simple merge

diff --cc version.php
index 6e7cade,55556f9..7cc7228
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012110700.01;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012110101.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012110800.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes