Merge branch 'MDL-59649-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:58:56 +0000 (08:58 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:58:56 +0000 (08:58 +0200)
commita3cb377374937d5b172aa5409962d0982ef4340a
tree04698ab9fac8498643bb769079ff1664523c682e
parent634d0f8330e5dc8bf804149a5c20555beb94aab5
parent4f5dbd38fbd32b48a56e1a7cdc0afccfd462d14b
Merge branch 'MDL-59649-master' of git://github.com/jleyva/moodle