Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:18:51 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:18:51 +0000 (14:18 +0100)
commit52516f2b1936b941b30aecce096e4e1b6e6fbb30
tree5699b23f9fa95afcfdca1f2ce17dbf0b838e38c9
parent743c937dae05965401c931e6894ffffc4fc96f85
parentd4062a0cff6fb00fe8dc5c1ef93bed862ede4cfc
Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle