Merge branch 'MDL-59515' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 12:11:23 +0000 (13:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Jul 2017 12:11:23 +0000 (13:11 +0100)
commitdda72b9d564aa78e29d51a32e3d0499e0b1ed49e
tree9baca21c678caeffd5e4bcf7a51b953e813943a3
parent00589c1f5a90936039a4d5b34b3974998de92bed
parent5b40aaa5e438bcd87d4c6e066e276cce3a6d15cc
Merge branch 'MDL-59515' of https://github.com/NeillM/moodle