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)
commitb3b18330973db5e3dc04b813331cee2c0154ab4c
tree8692eb4ca2827fb74b25bebb2470013b9b5829e7
parent2f8da1e814fb787a337c26c3cfa08261a827e6e2
parent7c4e686f9486cc6d667825cf02182f46cfc9580f
Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
course/externallib.php
course/tests/externallib_test.php
lib/db/services.php
version.php