Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)
Conflicts:
version.php

1  2 
backup/moodle2/restore_stepslib.php
version.php

Simple merge
diff --cc version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012052500.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012051900.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012052500.01;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes