Merge branch 'MDL-56913' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:29 +0000 (09:07 +0000)
commit6dad38deed08f6461f7bd38ba694c386d6a2fc67
tree1605a1fd4e861b9e9a39896c5252f265735309ab
parent585ba846dad117a1211c7bff73c0051051f381a8
parentf31d0fff2ef479c30f2990a901528f28ac14ecc5
Merge branch 'MDL-56913' of git://github.com/timhunt/moodle