Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
commit9f13573c433da756b8d45347f737d7a5ae2e650b
authorJake Dallimore <jake@moodle.com>
Tue, 16 May 2017 01:57:05 +0000 (16 09:57 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 16 May 2017 01:57:05 +0000 (16 09:57 +0800)
tree09d41678ac43cd10725042258bed7b4c28323ed0
parent5ff36095562ce33b7481c9329e7853ee0b1ed785
parent1768b85f09e45caa954d21022ffaf4f82c4dc5d3
Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle