Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:34:36 +0000 (09:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:34:36 +0000 (09:34 +0200)
commit8f2cee482d09c24b78ea54f8f9c66c2ced29c782
tree4f06a0b381893da58a311fc6bbc6976676057d15
parentbfaf47e168c623d0ebae0e33f7d783bf4edfd508
parent79349862846a5a2952b5343c0f66ceefb60e3b5b
Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle