Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 Nov 2016 02:28:59 +0000 (10:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 Nov 2016 02:28:59 +0000 (10:28 +0800)
1  2 
lib/db/services.php
message/externallib.php
message/tests/externallib_test.php
version.php

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