Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:14:30 +0000 (10:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:14:30 +0000 (10:14 +0800)
commit837cec00f9260177690aeafe42ea89d27aa8e59e
tree4892a2ad0087ccc3781b6f24fa0c1494326040dc
parent1a9c3d587fdf06bb369c4daed89362ab2d3eb289
parent52f3e060e455816844524fbfbde004ff7b52e37a
Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle

Conflicts:
lib/upgrade.txt
course/tests/externallib_test.php
lib/upgrade.txt
mod/assign/tests/externallib_test.php