Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:09:33 +0000 (17:09 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:09:33 +0000 (17:09 +0800)
commit224d819678fea1495ad16bf3c494c132f4dee1a6
tree05d78ccd61d3c0233306dadc3b158f0ebcafa2bf
parent8a086682555e3308458f8f73731d56e829fbffe5
parentc0ef63eb383d4dc78b166708eaf10df59c2421e3
Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle

Conflicts:
group/tests/externallib_test.php
lib/db/services.php
group/externallib.php
group/tests/externallib_test.php
lib/db/services.php