Merge branch 'MDL-59627-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Jul 2017 10:44:56 +0000 (11:44 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Jul 2017 10:44:56 +0000 (11:44 +0100)
commit396b97b2fb496e60bd3893c8effe9c0564327b33
tree5d4e3ea423a04a1c2f00a3d6d5fcff175d47c448
parent6cc8b0a4a6b610707d74cefa398614df88cc51b3
parent6cf2ab7394565cf8015444da0af1c11d1ba90dd4
Merge branch 'MDL-59627-master' of git://github.com/jleyva/moodle