Merge branch 'MDL-59172-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
commit587a8af21c30771f2c5faae8a8f337960cf9585f
authorDan Poltawski <dan@moodle.com>
Mon, 7 Aug 2017 15:20:14 +0000 (7 16:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Aug 2017 15:20:14 +0000 (7 16:20 +0100)
tree1a958132cdc2156d6402d40a9b709c17f7614b19
parenta8f61169c68f4f1a1c8836e92a7aa3dc383898e7
parent89e7d6eb7a408fe3206d4360435424fd55773d10
Merge branch 'MDL-59172-33' of https://github.com/snake/moodle into MOODLE_33_STABLE