Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Conflicts:
	version.php

diff --cc course/index.php
Simple merge

diff --cc course/lib.php
Simple merge

diff --cc version.php
index b53d09a,ae483e3..39175a8
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012062504.01;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012062503.10;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012062504.02;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes