Merge branch 'MDL-55548_master-fix' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 13:37:55 +0000 (14:37 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:36:38 +0000 (12:36 +0100)
commite66905375ec5aed7c35df3399fcc1f2b05d26c1e
treefc655d2426ffce1a24d0a4486c2b026931dc6cda
parent569907002fb72698bbb518ca6e7f0d4865d71f43
parentf25e2b1dc772346ddfb44b02e9d3946d727c4adb
Merge branch 'MDL-55548_master-fix' of https://github.com/markn86/moodle