Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:33:23 +0000 (08:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:33:23 +0000 (08:33 +0800)
Conflicts:
version.php

1  2 
config-dist.php
lang/en/admin.php
lib/db/upgrade.php
version.php

diff --cc config-dist.php
Simple merge
Simple merge
@@@ -4216,5 -4216,12 +4216,12 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2015030400.00);
      }
  
 -    if ($oldversion < 2015030500.01) {
++    if ($oldversion < 2015031100.00) {
+         // Unset old config variable.
+         unset_config('enabletgzbackups');
 -        upgrade_main_savepoint(true, 2015030500.01);
++        upgrade_main_savepoint(true, 2015031100.00);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015031000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015030500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015031100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.