Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 10:01:52 +0000 (12:01 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:49:36 +0000 (10:49 +0200)
commitd8e789c83787c414eb9d5ad4d99acea77285a4b2
tree89c92809546e999502386879a8f6861424bc7f69
parent0426cc9533325b6179acfe8c2cd7ee590e3470bf
parent0b8e7216675579de214255d012f595fae5737f7c
Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle