Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)
commit5ff36095562ce33b7481c9329e7853ee0b1ed785
tree1ec8c5b406342449c4839eec588149e69385af5a
parent52836e3c73b73ce1ccf41b84d7c2dd6cc547aa6b
parentb5eff76621d3c71aac6f17535cab103d555c0114
Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle