Merge branch 'MDL-57546-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:10:19 +0000 (14:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:10:19 +0000 (14:10 +0200)
commit549e57410f6ec1533285cb555fa8c614ee747a92
treeef937c8b2d884d23ece086366c8abf94581ce454
parent707f9beae1df53c5695b0314086dcf8310a5affe
parent2cad0cd3b6722b9e0b7ccda0a50be8bfb7948c41
Merge branch 'MDL-57546-master' of git://github.com/andrewnicols/moodle