Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 12:41:32 +0000 (14:41 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 12:41:32 +0000 (14:41 +0200)
commitbfdc3400615af6225733e7a6cb1fc274e45a369b
treea39b559d4ad6c2edd54167bb51121c6ef95c0451
parentd5a99c450ace4f0a3b5bd5106e1cfa48d415f238
parentd504e9207c4e3f41344b56017233880051fd0de5
Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle