Merge branch 'MDL-57042-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:00:45 +0000 (18:00 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:00:45 +0000 (18:00 +0000)
commit73430100ff77bc06f9a81411f0fd26d777ddee82
treea734bd2fed28e735db65c5b314eaf692e29145e1
parent0fbe41f4cda13cb2a205aaa4eaeeec45e595e3b6
parent9741087ffd691b05e6ffa290e217befe3bfa6355
Merge branch 'MDL-57042-master' of git://github.com/damyon/moodle