Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:24:10 +0000 (12:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:24:10 +0000 (12:24 +0000)
commite3ee9d48844563db41ff6a4fc12222b481c917f4
tree25a556832f9a56bdb49ac02494d9770246ae967c
parent1342a1c60518394f266db264ecae3510daa0b7bf
parentb27c8d8156a39fc9bc8cefab6fdf6f64b8921259
Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle