Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 23:19:13 +0000 (01:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 23:19:13 +0000 (01:19 +0200)
Conflicts:
version.php

1  2 
course/externallib.php
course/tests/externallib_test.php
lib/db/services.php
version.php

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