Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)
Conflicts:
version.php

1  2 
course/index.php
course/lib.php
version.php

Simple merge
diff --cc course/lib.php
Simple merge
diff --cc 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