Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 12:14:00 +0000 (13:14 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 12:14:00 +0000 (13:14 +0100)
commit992b2962095d7d83512ebf688953659fbbc722b0
treef9c859d4abd38f24011c14ae11bde958cbdec4a0
parent1d53b80c449bb0b971b6c741be4e1799bdf53e1d
parentd6c25e5c7df77953839018c5daf9fcc1e2430f77
Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle