Merge branch 'MDL-55551_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:53:31 +0000 (12:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:53:31 +0000 (12:53 +0100)
commit74a53156d621dc51079c33964b83a90092d27b68
tree9d36c3f1b8d8669954d412a7174d74c84972d245
parent293857b5ebf1e9871d05efc37296321b9e1a6647
parentf12d9aa801d04a300f7210074a932d89fcea10b6
Merge branch 'MDL-55551_m32v1' of https://github.com/sbourget/moodle