Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle
commit1d116698c71595a23bd70d3d0660871554429f5e
authorJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 05:39:57 +0000 (5 13:39 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 05:39:57 +0000 (5 13:39 +0800)
tree2fbe8227aeb729ffd675f24cbc5a253eeab69a61
parent7a37f761bcec641d3d5763132f199c77b8c5e837
parent50bbb5b254379589894dc2ffacb158bacea22983
Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle