Merge branch 'MDL-58035_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
commitb6a8a31088fe4d48eb06486ea10b1e656e52975c
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 17:51:44 +0000 (7 14:51 -0300)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:09:28 +0000 (10 18:09 +0000)
tree801bb8e2a6fd2956f01efd183201c066d46500ec
parent3fe3805d79afd682358aa31a6014792efe1c4313
parented961702c66ff92ba94d33addbabab83adb9e8dd
Merge branch 'MDL-58035_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE