Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:13:05 +0000 (15:13 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:13:05 +0000 (15:13 +0100)
commitad587bee83d851153db96d0ac60c1c0489f63f9f
treec1332a797fada34abdf5ffb9e4441e04f1cd78e3
parentbf39e7c7aaa51b9c914c6f4985e49ef244e99d61
parentb44e4748d6241f0b597149d350894cda722bbb2a
Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle