Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 02:03:23 +0000 (10:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 02:03:23 +0000 (10:03 +0800)
Conflicts:
version.php

1  2 
version.php

diff --cc 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