Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)
commit9a5f5ed56bcce7131395594e4489d341efd05d88
treecd60a7a92f55a3eb8d5e9718e2160d6d969b66a8
parenta724a97f25a054e6b1fd43d3b65fe0d92af5281d
parente8a7f5ff3b018f00af7fe844feda857d8704664e
Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle