Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)
commit77e1c18727775af556dde8a514c04cbc7e066b1c
tree67f4d8c36ef8130b9247fdef02c6d6da861aba01
parentf3b390182209277c513f0b45008b23c15445aee5
parentd1ee1e5f55640714dce6e155d11764774a0ebce9
Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle