Merge branch 'MDL-59569-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 07:43:56 +0000 (08:43 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 07:43:56 +0000 (08:43 +0100)
commit088494fd0492e81a5840a779f590cfae0be0c12d
tree1f200fe858b05b76785e9727f63c278c0d624de6
parent95d8e6116136f7bd6f410301360da9c2e6a2c88a
parent86be85dde7a0623303b91b4d30e8184c9d7082b7
Merge branch 'MDL-59569-master' of git://github.com/andrewnicols/moodle