Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Jun 2017 14:26:52 +0000 (15:26 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:39 +0000 (12:30 +0100)
commitfd5772e69191112d738b470fc36639c95481b12b
treeb10d1ddcd62064feaf8eb8e302857a48c2ef12d5
parentff3c693b583b94b06efc55ee831378e1e0e3f78f
parentd55c1ef2d2a2edd81936a6b22ecf1d74dab94fbe
Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle