Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle

Conflicts:
	version.php

diff --cc version.php
index 81dcd62,54e033a..2d97ff7
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012110201.02;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012110102.00;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012110600.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes