Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
Conflicts:
version.php

1  2 
version.php

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