Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 09:13:06 +0000 (10:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 09:13:06 +0000 (10:13 +0100)
Conflicts:
version.php

1  2 
version.php

diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015040200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015040200.03;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015040600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.