Merge branch 'MDL-59080_M33' of git://github.com/lazydaisy/moodle into MOODLE_33_STABLE
commit37ff4578bea2840c1aeeedfb786504cad6671c88
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:46 +0000 (5 12:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:49:46 +0000 (5 12:49 +0100)
treeac2467186802a6197ae7051ee1eecef1415196c0
parent078aaae0cfc2643bbaf0df730e480a585d44af11
parentdfac1616516a1048a5b441d06179311cebca75b4
Merge branch 'MDL-59080_M33' of git://github.com/lazydaisy/moodle into MOODLE_33_STABLE