Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 15:50:36 +0000 (15:50 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 15:50:36 +0000 (15:50 +0000)
commitb864c7fa1df58e5281907010008f7e8f9564e26d
treef1d050e2facd1d112b51dfb4b0113b6ae3ca6618
parentc4d9fd1afef016544f689a0ee807817e8560ee0e
parent59def6f3977022e2354aac196c4a3d7fb8fda126
Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle