Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
Conflicts:
version.php

1  2 
lib/db/services.php
version.php

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