Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:12:32 +0000 (11:12 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:12:32 +0000 (11:12 -0300)
commit6dba6a5a6a85cfcc741febd5df1dd9c2fe8ffd14
tree6391c080fb5be6aa91d562208ef7408a5a475bbd
parent7ebe17f38a727e340355695bb84cba99c31b1cca
parent004738e03dea8fca5d33bf830d3b5f82b202841d
Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle