Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:15:44 +0000 (19:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:15:44 +0000 (19:15 +0200)
commit62a38a4ece516625be008f7e433fd21a755749db
tree59b311d875e5c91900b65a8d0bb2fb275f243875
parenta272c256495e69ae4c092b3ec577e80dbeaa52dc
parent9da0be8c469f765cb27a40d5ee0ef640c18a02f9
Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle