Merge branch 'MDL-56995-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 15:07:26 +0000 (15:07 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 15:07:26 +0000 (15:07 +0000)
commit2ec4ed4dba16e6a9af7f4a02aba7f1ce5c77a4dc
tree149f78e18c8c773587bedb60c3ae36a91c744767
parent203f51d627b67544994cac08d42dab627ba52bf4
parent242997744d052e3e01d3ec00748db1950c63e097
Merge branch 'MDL-56995-master' of git://github.com/damyon/moodle