Merge branch 'MDL-42125' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 10:46:52 +0000 (11:46 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Sep 2016 10:46:52 +0000 (11:46 +0100)
commit7c5b0bbcbe9586a89f1b7e05aeb41ab800de4c9f
tree18a2bd1ae5662ebcdaf0477fbdb2129d75cff415
parentaed3367f1e37edac47a9b9de40b7e5d10a52aa0e
parent6ae04c2684bfcbd90d31a2ca777c782a054cf6a2
Merge branch 'MDL-42125' of git://github.com/timhunt/moodle