Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
commit4d4c5992ee95394d52b2c6a0feeeab6f86fa3f96
authorDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:39:43 +0000 (11 14:39 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:39:43 +0000 (11 14:39 +0100)
tree56ba6512f46e5ed4058896cd9077caf8f7bc20c0
parent52516f2b1936b941b30aecce096e4e1b6e6fbb30
parent7aaca085fb4de37d378add1f08b3d8b1ef61c291
Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle